修改bug

src/main/java/com/keymobile/indicators/api/hytobacco/TaskRuleCtrl.java

@@ -75,30 +75,10 @@ public class TaskRuleCtrl {
     @PostMapping("save")
     public Result save(@RequestBody TaskRule rule) {
         Result result = null;
-
-        String orgNo = rule.getOrgNo();
-        int orgType=0;
-        if(orgNo!=null&&orgNo!=""){
-            int size = orgNo.length();
-            if(size==2){
-                orgType = Constants.RULE_TYPE_PROVINCE;
-            }else if(size==4){
-                orgType =  Constants.RULE_TYPE_CITY;
-            }else if(size==6){
-                orgType = Constants.RULE_TYPE_COUNTY;
-            }
-        }
-        if(orgType==0){
-            return Result.genFailedResult("没有该操作权限!");
-        }
-        rule.setOrgType(orgType);
-
         TaskRule temp = taskRuleService.findRuleByName(rule.getRuleLevel(), rule.getName());
         if (temp != null && !temp.getId().equals(rule.getId())) {
             result = Result.genFailedResult("已经存在同名任务规则定义!");
-        } else if(temp!=null && temp.getOrgType()!=orgType){
-            result = Result.genFailedResult("没有该操作权限!");
-        }else {
+        } else {
             Date now = new Date();
             String currentUserId = SystemUserUtil.getCurrentUserId();
             rule.setUpdater(currentUserId);

src/main/java/com/keymobile/indicators/model/entity/dataenter/TaskRule.java

@@ -102,10 +102,7 @@ public class TaskRule extends BaseModel {
      */
     private Date lastActiveTime;
 
-    /**
-     * 1省 2市 3县（增加规则用户机构的级别）
-     */
-    private Integer orgType;
+
     /**
      * 关联的指标
      */
@@ -114,7 +111,7 @@ public class TaskRule extends BaseModel {
     /**
      * 接收机构编号
      * */
-    @Transient
+
     private String orgNo;
 
     /**

src/main/java/com/keymobile/indicators/model/mapper/indicators/TaskRuleMapper.java

@@ -41,7 +41,7 @@ public interface TaskRuleMapper extends BaseMapper<TaskRule> {
      * @return
      */
     List<TaskRule> findRuleByPage(@Param("ruleType") Integer ruleType, @Param("ruleLevel") String ruleLevel, @Param("keyword") String keyword,
-                                  @Param("start") long start, @Param("pageSize") int pageSize,@Param("orgType") Integer orgType);
+                                  @Param("start") long start, @Param("pageSize") int pageSize,@Param("orgNo") String orgNo);
 
     /**
      * 查询填报任务规则总数
@@ -50,5 +50,5 @@ public interface TaskRuleMapper extends BaseMapper<TaskRule> {
      * @param keyword
      * @return
      */
-    long findRuleCount(@Param("ruleType") Integer ruleType, @Param("ruleLevel") String ruleLevel, @Param("keyword") String keyword,@Param("orgType") Integer orgType);
+    long findRuleCount(@Param("ruleType") Integer ruleType, @Param("ruleLevel") String ruleLevel, @Param("keyword") String keyword,@Param("orgNo") String orgNo);
 }

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskRuleServiceImpl.java

@@ -102,25 +102,26 @@ public class TaskRuleServiceImpl implements TaskRuleService {
     @Override
     public Page<TaskRule> findRuleByPage(Integer ruleType, String ruleLevel, String keyword, int page, int pageSize,String orgNo,Boolean sysAdmin) {
 
-        Integer oryType = null;
+//        Integer oryType = null;
         boolean tmp = true;
-        if(!BooleanUtils.isTrue(sysAdmin)){
-            if(StringUtils.isNotBlank(orgNo)){
-                oryType = orgNo.length()/2;
-            }else{
-                //不是省市县任何一种类型且不是管理员
-                tmp = false;
-            }
-        }
-        long total =0;
+//        if(!BooleanUtils.isTrue(sysAdmin)){
+//            if(StringUtils.isNotBlank(orgNo)){
+//                oryType = orgNo.length()/2;
+//            }else{
+//                //不是省市县任何一种类型且不是管理员
+//                tmp = false;
+//            }
+//        }
+        orgNo=null;
+      long total =0;
         if(tmp){
-            total =taskRuleMapper.findRuleCount(ruleType, ruleLevel, keyword,oryType);
+            total =taskRuleMapper.findRuleCount(ruleType, ruleLevel, keyword,orgNo);
         }
 
         PageRequest request = PageRequest.of(page - 1, pageSize);
         List<TaskRule> list = new ArrayList<>();
         if (total > 0) {
-           list = taskRuleMapper.findRuleByPage(ruleType, ruleLevel, keyword, request.getOffset(), pageSize,oryType);
+           list = taskRuleMapper.findRuleByPage(ruleType, ruleLevel, keyword, request.getOffset(), pageSize,orgNo);
         }
         Page<TaskRule> pageResult = new PageImpl<TaskRule>(list, request, total);
         return pageResult;

src/main/resources/mybatis/mapping/TaskRuleMapper.xml

@@ -43,8 +43,8 @@
 		<if test="keyword != null and keyword != ''">
 			and rule.name like concat('%', #{keyword}, '%')
 		</if>
-		<if test="orgType != null">
-			and rule.org_type = #{orgType}
+		<if test="orgNo != null and orgNo != ''">
+			and rule.orgNo = #{orgNo}
 		</if>
 	</sql>
 	<select id="findRuleCount" resultType="long">