Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/constant/VciSystemVarConstants.java

@@ -4,6 +4,7 @@
import com.vci.ubcs.starter.web.pagemodel.SessionInfo;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.VciDateUtil;
import org.springblade.core.secure.utils.AuthUtil;

import java.util.*;
import java.util.stream.Collectors;
@@ -45,25 +46,23 @@

   public static Map<String, String> getSystemVarValueMap() {
      Map<String, String> systemVarMap = new HashMap();
      SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
      if (sessionInfo != null) {
         systemVarMap.put("#CURRENTUSER.OID#", sessionInfo.getUserOid());
         systemVarMap.put("#CURRENTUSER.ID#", sessionInfo.getUserId());
         systemVarMap.put("#CURRENTUSER_NAME#", sessionInfo.getUserName());
         systemVarMap.put("#CURRENTDATETIME#", VciDateUtil.getNowString());
         systemVarMap.put("#CURRENTDATE#", VciDateUtil.getNowString("yyyy-MM-dd"));
         systemVarMap.put("#CURRENTTIME#", VciDateUtil.getNowString("HH:mm:ss"));
         systemVarMap.put("#CURRENTUSER.SECRETGRADE#", sessionInfo.getUserSecret());
         systemVarMap.put("#CURRENTUSER.GROUPNAME#", sessionInfo.getDeptName());
         systemVarMap.put("#CURRENTUSER.GROUPOID#", sessionInfo.getDeptOid());
         systemVarMap.put("#CURRENTUSER.EMAIL#", sessionInfo.getEmail());
         systemVarMap.put("#CURRENTUSER.ROLENAME#", (String) ((Collection) Optional.ofNullable(sessionInfo.getRolesName().values()).orElseGet(() -> {
            return new ArrayList();
         })).stream().collect(Collectors.joining(",")));
         systemVarMap.put("#CURRENTUSER.IPSECRET#", sessionInfo.getIpSecret());
         systemVarMap.put("#CURRENTUSER.BUSINESSUNIT#", sessionInfo.getOrgsOid());
         systemVarMap.put("#CURRENTUSER.BUSINESSUNITNAME#", sessionInfo.getOrgsName());
      }
//      SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
//      if (sessionInfo != null) {
      systemVarMap.put("#CURRENTUSER.OID#", String.valueOf(AuthUtil.getUser().getUserId()));
      systemVarMap.put("#CURRENTUSER.ID#", AuthUtil.getUser().getAccount());
      systemVarMap.put("#CURRENTUSER_NAME#", AuthUtil.getUser().getUserName());
      systemVarMap.put("#CURRENTDATETIME#", VciDateUtil.getNowString());
      systemVarMap.put("#CURRENTDATE#", VciDateUtil.getNowString("yyyy-MM-dd"));
      systemVarMap.put("#CURRENTTIME#", VciDateUtil.getNowString("HH:mm:ss"));
      systemVarMap.put("#CURRENTUSER.SECRETGRADE#", (String) AuthUtil.getUser().getDetail().get("secretGrade"));
      systemVarMap.put("#CURRENTUSER.GROUPNAME#", (String) AuthUtil.getUser().getDetail().get("deptName"));
      systemVarMap.put("#CURRENTUSER.GROUPOID#", AuthUtil.getUser().getDeptId());
      systemVarMap.put("#CURRENTUSER.EMAIL#", (String) AuthUtil.getUser().getDetail().get("email"));
      systemVarMap.put("#CURRENTUSER.ROLENAME#", AuthUtil.getUser().getRoleName());
      systemVarMap.put("#CURRENTUSER.IPSECRET#", "");
      systemVarMap.put("#CURRENTUSER.BUSINESSUNIT#", AuthUtil.getUser().getTenantId());
      systemVarMap.put("#CURRENTUSER.BUSINESSUNITNAME#", (String) AuthUtil.getUser().getDetail().get("tenantName"));
//      }

      return systemVarMap;
   }