Browse Source

fix: 站长id使用配置文件形式

zhangying 1 week ago
parent
commit
3c6cb0a0d2

+ 2 - 2
src/main/java/com/hz/employmentsite/AppConfig.java

@@ -4,7 +4,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 
 /**
  * @author wufs
@@ -83,7 +82,8 @@ public class AppConfig {
     /*@Value("${appconfig.ztndatagdgovConfig.passToken}")*/
     public String gdgov_passToken;
 
-
+    @Value("${appconfig.zz-roleId}")
+    public String zzRoleID;
 
     /**
      * @Description //TODO 静态文件路径

+ 5 - 2
src/main/java/com/hz/employmentsite/services/impl/taskAndLog/DoWorkImpl.java

@@ -2,6 +2,7 @@ package com.hz.employmentsite.services.impl.taskAndLog;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hz.employmentsite.AppConfig;
 import com.hz.employmentsite.mapper.PcDoworkMapper;
 import com.hz.employmentsite.mapper.PcSiteUserMapper;
 import com.hz.employmentsite.mapper.cquery.DoWorkCQuery;
@@ -45,6 +46,9 @@ public class DoWorkImpl implements DoWorkService {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private AppConfig appConfig;
+
     @Override
     public PageInfo<DoWorkVo> getList(int pageIndex, int pageSize, List<String> doWorkIDList,
                                       String userName, String workStartDate, String workEndDate,
@@ -54,8 +58,7 @@ public class DoWorkImpl implements DoWorkService {
         if (!stringUtils.IsNullOrEmpty(userId)) {
             List<RoleModel> userRole = roleService.getRoleByUserID(userId);
             if (!userRole.isEmpty()) {
-                // RoleModel sysRole = userRole.stream().filter(it -> it.getRoleID().equals("f5a36ac2-2aec-4f3e-9d80-cfcb26d44fac")).findFirst().orElse(null); // 本地 站长ID
-                RoleModel sysRole = userRole.stream().filter(it -> it.getRoleID().equals("d989844d-45d7-4b79-8262-7567a93de0af")).findFirst().orElse(null); // 正式平台 站长ID
+                RoleModel sysRole = userRole.stream().filter(it -> it.getRoleID().equals(appConfig.zzRoleID)).findFirst().orElse(null);
                 if (sysRole != null) {
                     // 查询用户所属的驿站
                     UserInfoModel userInfo = userService.getUserInfo(userId);