用户分页接口修改

zjugis-business/src/main/java/com/zjugis/business/flow/attendancenote/event/AttendanceNoteEvent.java

@@ -88,8 +88,6 @@ public class AttendanceNoteEvent extends BaseController {
     @PostMapping("/flowArchingEvent")
     public String flowArchingEvent(@ParamModel Map flowInstance, @ParamModel Map triggerFinishActivityInstance) {
         try {
-            flowInstance = new HashMap();
-            flowInstance.put("id","018d5e4f6a9c0a07e1f88d5e36cc001c");
             if (!Objects.isNull(flowInstance) && flowInstance.containsKey("id")) {
                 String flowInstanceId = flowInstance.get("id").toString();
                 AttendanceNoteDO entity = attendanceNoteService.findByInstanceId(flowInstanceId);

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/dal/mysql/user/AdminUserMapper.java

@@ -40,6 +40,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
         if(StringUtils.isNotBlank(reqVO.getDeptId())){
             adminUserDOLambdaQueryWrapper = new LambdaQueryWrapperX<AdminUserDO>()
                     .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
+                    .likeIfPresent(AdminUserDO::getNickname, reqVO.getNickname())
                     .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
                     .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
                     .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())