Przeglądaj źródła

advice msg display; like query with entName

dengjia 2 miesięcy temu
rodzic
commit
2d0a8fa294

+ 2 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -1216,7 +1216,7 @@ public class WmSupervisionManager {
             isSupervision ? new Page<>(1, 99999) : new Page<>(query.getCurrent(), query.getSize()),
             Wrappers.<SysDept>lambdaQuery()
                 .eq(SysDept::getLevel, 4)
-                .eq(StrUtil.isNotBlank(query.getEntName()), SysDept::getName, query.getEntName())
+                .like(StrUtil.isNotBlank(query.getEntName()), SysDept::getName, query.getEntName())
                 .in(CollUtil.isNotEmpty(entIds), SysDept::getDeptId, entIds));
 
     List<SysDept> depts = deptPage.getRecords();
@@ -1900,7 +1900,7 @@ public class WmSupervisionManager {
                             : role.getRoleName()));
                 String realName = u.getRealname();
                 String date = formatter.format(adv.getCreateTime());
-                String resultMsg = adv.getAdviceResult() ? " 通过 " : " 不通过 ";
+                String resultMsg = adv.getAdviceResult() ? " 同意 " : " 不同意 ";
                 String remarks =
                     StrUtil.isBlank(adv.getRemarks()) ? " " : adv.getRemarks();