no message

src/main/java/com/chenyang/nse/bussiness/service/console/impl/DesensitizationStrategyLogImpl.java

@@ -28,62 +28,43 @@ public class DesensitizationStrategyLogImpl implements DesensitizationStrategyLo
    @Autowired
    TCoreDesensitizationStrategyLogDao tCoreDesensitizationStrategyLogDao;
 
-   public List<DesensitizationStrategyLogVO> queryRow(PageInfo pageInfo, String module, String range, String user, String projectId) {
-      Criterion moduleCon;
-      if (module != null && !"".equals(module)) {
-         moduleCon = Restrictions.eq("operModule", module);
-      } else {
-         moduleCon = Restrictions.like("operModule", "%%");
-      }
-
-      Criterion userCon;
-      if (user != null && !"".equals(user)) {
-         userCon = Restrictions.eq("createuser", user);
-      } else {
-         userCon = Restrictions.like("createuser", "%%");
-      }
-
-      Date today = new Date();
-      List<TCoreDesensitizationStrategyLog> logList;
-      if (range != null && !"".equals(range)) {
-         if (!"0".equals(range)) {
+public List<DesensitizationStrategyLogVO> queryRow(PageInfo pageInfo, String module, String range, String user, String projectId) {
+    List<Criterion> criteriaList = new ArrayList<>();
+
+    if (module != null && !module.isEmpty()) {
+        criteriaList.add(Restrictions.eq("operModule", module));
+    }
+    if (user != null && !user.isEmpty()) {
+        criteriaList.add(Restrictions.eq("createuser", user));
+    }
+
+    Date today = new Date();
+    if (range != null && !range.isEmpty()) {
+        if (!"0".equals(range)) {
             if (!"全部".equals(range)) {
-               Criterion timeCon = Restrictions.between("createtime", DateTimeTool.beforeDays(today, Integer.valueOf(range)), today);
-               if (null != projectId && !"".equals(projectId.trim())) {
-                  logList = this.tCoreDesensitizationStrategyLogDao.queryByPageInfo(pageInfo, Order.desc("createtime"), new Criterion[]{moduleCon, timeCon, userCon, Restrictions.eq("projectId", projectId)});
-               } else {
-                  logList = this.tCoreDesensitizationStrategyLogDao.queryByPageInfo(pageInfo, Order.desc("createtime"), new Criterion[]{moduleCon, timeCon, userCon});
-               }
-            } else if (null != projectId && !"".equals(projectId.trim())) {
-               logList = this.tCoreDesensitizationStrategyLogDao.queryByPageInfo(pageInfo, Order.desc("createtime"), new Criterion[]{moduleCon, userCon, Restrictions.eq("projectId", projectId)});
-            } else {
-               logList = this.tCoreDesensitizationStrategyLogDao.queryByPageInfo(pageInfo, Order.desc("createtime"), new Criterion[]{moduleCon, userCon});
-            }
-         } else {
-            Criterion timeCon = Restrictions.ge("createtime", DateTimeTool.dayOfStart(today));
-            if (null != projectId && !"".equals(projectId.trim())) {
-               logList = this.tCoreDesensitizationStrategyLogDao.queryByPageInfo(pageInfo, Order.desc("createtime"), new Criterion[]{moduleCon, timeCon, userCon, Restrictions.eq("projectId", projectId)});
-            } else {
-               logList = this.tCoreDesensitizationStrategyLogDao.queryByPageInfo(pageInfo, Order.desc("createtime"), new Criterion[]{moduleCon, timeCon, userCon});
+                criteriaList.add(Restrictions.between("createtime", DateTimeTool.beforeDays(today, Integer.parseInt(range)), today));
             }
-         }
-      } else if (null != projectId && !"".equals(projectId.trim())) {
-         logList = this.tCoreDesensitizationStrategyLogDao.queryByPageInfo(pageInfo, Order.desc("createtime"), new Criterion[]{moduleCon, userCon, Restrictions.eq("projectId", projectId)});
-      } else {
-         logList = this.tCoreDesensitizationStrategyLogDao.queryByPageInfo(pageInfo, Order.desc("createtime"), new Criterion[]{moduleCon, userCon});
-      }
-
-      List<DesensitizationStrategyLogVO> list = new ArrayList();
-      if (!ObjectUtils.isEmpty(logList)) {
-         logList.forEach((item) -> {
-            DesensitizationStrategyLogVO desensitizationStrategyLogVO = new DesensitizationStrategyLogVO();
-            BeanUtils.copyProperties(item, desensitizationStrategyLogVO);
-            list.add(desensitizationStrategyLogVO);
-         });
-      }
-
-      return list;
-   }
+        } else {
+            criteriaList.add(Restrictions.ge("createtime", DateTimeTool.dayOfStart(today)));
+        }
+    }
+    if (projectId != null && !projectId.trim().isEmpty()) {
+        criteriaList.add(Restrictions.eq("projectId", projectId));
+    }
+
+    List<TCoreDesensitizationStrategyLog> logList = tCoreDesensitizationStrategyLogDao
+            .queryByPageInfo(pageInfo, Order.desc("createtime"), criteriaList.toArray(new Criterion[0]));
+
+    List<DesensitizationStrategyLogVO> list = new ArrayList<>();
+    if (!ObjectUtils.isEmpty(logList)) {
+        logList.forEach(item -> {
+            DesensitizationStrategyLogVO vo = new DesensitizationStrategyLogVO();
+            BeanUtils.copyProperties(item, vo);
+            list.add(vo);
+        });
+    }
+    return list;
+}
 
    public List<Map<String, Object>> queryList(String module, String range, String user, String projectId) {
       Criterion moduleCon;