dept_id

ims-service/ims-eval/src/main/java/com/ims/eval/config/permission/PermissionAspect.java

@@ -2,6 +2,7 @@ package com.ims.eval.config.permission;
 
 import cn.hutool.core.util.ClassUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.ims.eval.cache.CacheContext;
@@ -208,8 +209,8 @@ public class PermissionAspect implements Interceptor {
 		if (StringUtils.isBlank(code)){
 			return null;
 		}
-		Object json = serviceBuilder.getGatewayUrl().getSysUser(code);
-		MyuserResDTO user = JSON.parseObject(json.toString(), MyuserResDTO.class);
+		JSONObject json = serviceBuilder.getGatewayUrl().getSysUser(code);
+		MyuserResDTO user = JSONObject.parseObject(json.getJSONObject("data").toJSONString(), MyuserResDTO.class);
 		return user;
 	}
 

ims-service/ims-eval/src/main/java/com/ims/eval/dao/OrganizationEvaluationInfoMapper.java

@@ -1,5 +1,6 @@
 package com.ims.eval.dao;
 
+import com.ims.eval.config.permission.DataPermission;
 import com.ims.eval.entity.OrganizationEvaluationInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ims.eval.entity.dto.response.OrganizationEvaluationInfoResDTO;
@@ -17,17 +18,18 @@ import java.util.List;
  * @author wang
  * @since 2023-03-16
  */
+@DataPermission
 public interface OrganizationEvaluationInfoMapper extends BaseMapper<OrganizationEvaluationInfo> {
 
 
 
-
+	@DataPermission
 	List<OrganizationEvaluationInfoResDTO> selectListEvaluationInfoId(@Param("organizationEvaluationId") String organizationEvaluationId,
 																	  @Param("dept") String dept,
 																	  @Param("optionCode") String optionCode,
 																	  @Param("organizationId") String organizationId);
 
-
+	@DataPermission
 	List<OrganizationEvaluationInfoResDTO> selectListEvaluationInfoId2(@Param("organizationEvaluationId") String organizationEvaluationId,
 																	  @Param("dept") String dept,
 																	  @Param("organizationShortName") String organizationShortName,

ims-service/ims-eval/src/main/java/com/ims/eval/entity/OrganizationEvaluationInfo.java

@@ -112,4 +112,10 @@ public class OrganizationEvaluationInfo extends Model {
 	private String evaluateRuleInfoId;
 
 
+	/**
+	 * 指标部门id
+	 */
+	private String  deptId;
+
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/response/EvaluateRuleInfoIndicatorDTO.java

@@ -44,5 +44,10 @@ public class EvaluateRuleInfoIndicatorDTO {
 	private String  childCode;
 
 
+	/**
+	 * 指标所属部门
+	 */
+	private String deptId;
+
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/response/IndicatorResDTO.java

@@ -40,6 +40,12 @@ public class IndicatorResDTO {
 	private String  childCode;
 
 
+	/**
+	 * 指标部门id
+	 */
+	private String deptId;
+
+
 
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationEvaluationServiceImpl.java

@@ -337,6 +337,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					info.setOrganizationEvaluationId(organizationEvaluation.getId());
 					info.setOrganizationEvaluationRuleId(ruleId);
 					info.setIndicatorId(r.getId());
+					info.setDeptId(r.getDeptId());
 					info.setChildCode(r.getChildCode());
 					info.setIndicatorDictionaryId(r.getIndicatorDictionaryID());
 					info.setOptionCode(r.getOptionCode());
@@ -428,6 +429,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					info.setEvaluateRuleInfoId(r.getId());
 					info.setIndicatorId(r.getIndicatorId());
 					info.setChildCode(r.getChildCode());
+					info.setDeptId(r.getDeptId());
 					info.setIndicatorDictionaryId(r.getIndicatorDictionaryID());
 					info.setOptionCode(r.getOptionCode());
 					info.setIsQuantified(r.getIsQuantified());
@@ -503,6 +505,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					info.setOrganizationEvaluationRuleId(ruleId);
 					info.setIndicatorId(r.getId());
 					info.setChildCode(r.getChildCode());
+					info.setDeptId(r.getDeptId());
 					info.setIndicatorDictionaryId(r.getIndicatorDictionaryID());
 					info.setOptionCode(r.getOptionCode());
 					info.setIsQuantified(r.getIsQuantified());

ims-service/ims-eval/src/main/resources/mappers/EvaluateRuleInfoMapper.xml

@@ -62,6 +62,7 @@
         ri.id id,
         i.id indicatorId,
         i.is_quantified isQuantified,
+        i.dept_id,
         d.id indicatorDictionaryID,
         d.option_code optionCode,
         d.option_name optionName,

ims-service/ims-eval/src/main/resources/mappers/EvaluationScoreCountMapper.xml

@@ -23,7 +23,7 @@
         LEFT JOIN organization_evaluation_rule o on  c.organization_evaluation_rule_id = o.id
         left join bin_section b on b.id = i.bin_section
         left join bin_stage s on s.id = i.bin_stage
-        left join data_dictionary d on d.data_key = i.dept
+        left join data_dictionary d on d.data_key = i.dept_id
 
         <where>
             <if test="organizationEvaluationId !=null and organizationEvaluationId !=''">

ims-service/ims-eval/src/main/resources/mappers/IndicatorMapper.xml

@@ -93,6 +93,7 @@
 
         SELECT
         i.id id,
+        i.dept_id,
         i.is_quantified isQuantified,
         d.id indicatorDictionaryID,
         d.option_code optionCode,

ims-service/ims-eval/src/main/resources/mappers/OrganizationEvaluationInfoMapper.xml

@@ -58,7 +58,7 @@
         left join bin_section bn on i.bin_section = bn.id
         left join indicator_type it on i.indicator_type_id = it.id
         left join indicator_dictionary id on ei.indicator_dictionary_id = id.id
-        inner join data_dictionary dd on dd.data_key = i.dept
+        inner join data_dictionary dd on dd.data_key = i.dept_id
         <where>
 
             <if test="organizationEvaluationId !=null and organizationEvaluationId !=''">
@@ -145,7 +145,7 @@
         left join bin_section bn on i.bin_section = bn.id
         left join indicator_type it on i.indicator_type_id = it.id
         left join indicator_dictionary id on ei.indicator_dictionary_id = id.id
-        inner join data_dictionary dd on dd.data_key = i.dept
+        inner join data_dictionary dd on dd.data_key = i.dept_id
         <where>
 
             <if test="organizationEvaluationId !=null and organizationEvaluationId !=''">

ims-service/ims-eval/src/main/resources/mappers/ResponsibilityIndicatorInfoMapper.xml

@@ -54,7 +54,7 @@
         left join bin_stage be on i.bin_stage = be.id
         left join bin_section bn on i.bin_section = bn.id
         left join indicator_type it on i.indicator_type_id = it.id
-        inner join data_dictionary dd on dd.data_key = i.dept
+        inner join data_dictionary dd on dd.data_key = i.dept_id
         <where>
             ri.dept_responsibility_id in  <foreach item="item" collection="deptResponsibilityIds" separator="," open="(" close=")" index="">'${item}'</foreach>