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