Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/change/ChangeTypeServiceImpl.java

@@ -120,6 +120,11 @@ public class ChangeTypeServiceImpl implements ChangeTypeService {
         if (changeTypes.get(0) == null || changeTypes.get(1) == null){
             throw ExceptionFactory.createParamFail();
         }
+        //查询一级下班是否还存在其他二级  如果不存在就删除一级 如果存在一级就不做伪删
+        List<ChangeType> changeTypeList = mapper.queryParent(changeTypes.get(0).getId());
+        if (changeTypeList.size() == 2){
+            changeTypes.remove(0);
+        }
         for (ChangeType changeType : changeTypes){
             Example example = new Example(ChangeType.class);
             Example.Criteria criteria = example.createCriteria();

yanxuan-qc-change-system-dal/src/main/resources/mybatis/mapper/ChangeConfigMapper.xml

@@ -54,8 +54,9 @@
         update_time <![CDATA[ < ]]> #{updateTime} and
       </if>
       <if test="changeExecDepartment != null and changeExecDepartment != ''">
-        participate_change_exec_department like "%" #{changeExecDepartment} "%"
+        participate_change_exec_department like "%" #{changeExecDepartment} "%" and
       </if>
+        1=1
     </where>
   </select>
 

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeConfigController.java

@@ -30,6 +30,7 @@ public class ChangeConfigController {
             @RequestParam(name = "changeExecDepartment",required = false) String changeExecDepartment,
             @RequestParam(name = "parentChangeClassId",required = false)Integer parentChangeClassId,
             @RequestParam(name = "sonChangeClassId",required = false)Integer sonChangeClassId,
+            @RequestParam(name = "changeLevel",required = false)Integer changeLevel,
             @RequestParam(name = "createTime",required = false)Long createTime,
             @RequestParam(name = "updateTime",required = false)Long updateTime){
         ChangeConfigQueryReq req = new ChangeConfigQueryReq();
@@ -37,6 +38,7 @@ public class ChangeConfigController {
         req.setChangeExecDepartment(changeExecDepartment);
         req.setParentChangeClassId(parentChangeClassId);
         req.setSonChangeClassId(sonChangeClassId);
+        req.setChangeLevel(changeLevel);
         req.setCreateTime(createTime);
         req.setUpdateTime(updateTime);
         return service.queryChanges(pageNum,pageSize,req);