no message

src/main/java/com/chenyang/nse/bussiness/controller/aop/EncryptLogController.java

@@ -76,8 +76,8 @@ public class EncryptLogController {
          projectId = vo.get("projectId").toString();
       }
 
-      String module = vo.get("module").toString();
-      String range = vo.get("range").toString();
+      String module = vo.get("module") == null ? "" : vo.get("module").toString();
+      String range = vo.get("range") == null ? "" : vo.get("range").toString();
       String user = "";
       if (null != vo.get("user")) {
          user = vo.get("user").toString();

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

@@ -267,53 +267,38 @@ public class UserServiceImpl implements UserService {
    }
 
    public List<AppUserVO> queryappuservo(PageInfo pageInfo, Map<String, String> params) {
-      new ArrayList();
-      String useridentifier = "";
-      if (null != params && null != params.get("useridentifier")) {
-         useridentifier = (String)params.get("useridentifier");
-      }
-
-      Criterion criterion1 = Restrictions.like("useridentifier", useridentifier, MatchMode.ANYWHERE);
-      String username = "";
-      if (null != params && null != params.get("username")) {
-         username = (String)params.get("username");
-      }
-
-      Criterion criterion2 = Restrictions.like("username", username, MatchMode.ANYWHERE);
-      String note = "";
-      if (null != params && null != params.get("note")) {
-         note = (String)params.get("note");
-      }
-
-      Criterion criterion5 = Restrictions.like("note", note, MatchMode.ANYWHERE).ignoreCase();
-      List<TBaseAppUser> appUserList = this.tBaseAppUserDao.queryByPageInfo(pageInfo, Order.desc("createtime"), new Criterion[]{criterion1, criterion2, criterion5});
-      String isoriginal = "";
-      if (null != params && null != params.get("isoriginal") && !"".equals(((String)params.get("isoriginal")).trim()) && (null == params.get("ismask") || "".equals(((String)params.get("ismask")).trim()))) {
-         isoriginal = (String)params.get("isoriginal");
-         Criterion criterion3 = Restrictions.eq("isoriginal", isoriginal);
-         appUserList = this.tBaseAppUserDao.queryByPageInfo(pageInfo, Order.desc("createtime"), new Criterion[]{criterion1, criterion2, criterion3, criterion5});
-      }
-
-      String ismask = "";
-      if (null != params && null != params.get("ismask") && !"".equals(((String)params.get("ismask")).trim()) && (null == params.get("isoriginal") || "".equals(((String)params.get("isoriginal")).trim()))) {
-         ismask = (String)params.get("ismask");
-         Criterion criterion4 = Restrictions.eq("ismask", ismask);
-         appUserList = this.tBaseAppUserDao.queryByPageInfo(pageInfo, Order.desc("createtime"), new Criterion[]{criterion1, criterion2, criterion4, criterion5});
-      }
-
-      if (null != params && null != params.get("ismask") && !"".equals(((String)params.get("ismask")).trim()) && null != params.get("isoriginal") && !"".equals(((String)params.get("isoriginal")).trim())) {
-         appUserList = this.tBaseAppUserDao.queryByPageInfo(pageInfo, Order.desc("createtime"), new Criterion[]{criterion1, criterion2, criterion5, Restrictions.eq("isoriginal", (String)params.get("isoriginal")), Restrictions.eq("ismask", (String)params.get("ismask"))});
+      List<Criterion> criteria = new ArrayList<>();
+      if (params != null) {
+         String useridentifier = params.get("useridentifier");
+         if (StringUtils.isNotBlank(useridentifier)) {
+            criteria.add(Restrictions.like("useridentifier", useridentifier, MatchMode.ANYWHERE));
+         }
+         String username = params.get("username");
+         if (StringUtils.isNotBlank(username)) {
+            criteria.add(Restrictions.like("username", username, MatchMode.ANYWHERE));
+         }
+         String note = params.get("note");
+         if (StringUtils.isNotBlank(note)) {
+            criteria.add(Restrictions.like("note", note, MatchMode.ANYWHERE).ignoreCase());
+         }
+         String isoriginal = params.get("isoriginal");
+         if (StringUtils.isNotBlank(isoriginal)) {
+            criteria.add(Restrictions.eq("isoriginal", isoriginal));
+         }
+         String ismask = params.get("ismask");
+         if (StringUtils.isNotBlank(ismask)) {
+            criteria.add(Restrictions.eq("ismask", ismask));
+         }
       }
-
-      List<AppUserVO> appUserVOList = new ArrayList();
+      List<TBaseAppUser> appUserList = tBaseAppUserDao.queryByPageInfo(pageInfo, Order.desc("createtime"), criteria.toArray(new Criterion[0]));
+      List<AppUserVO> appUserVOList = new ArrayList<>();
       if (!ObjectUtils.isEmpty(appUserList)) {
-         appUserList.forEach((item) -> {
+         appUserList.forEach(item -> {
             AppUserVO appUserVO = new AppUserVO();
             BeanUtils.copyProperties(item, appUserVO);
             appUserVOList.add(appUserVO);
          });
       }
-
       return appUserVOList;
    }