diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkUserController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkUserController.java index 8aa7b48c..adb18e19 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkUserController.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkUserController.java @@ -5,6 +5,7 @@ import com.xhpc.activity.domain.XhpcWorkUserDomain; import com.xhpc.activity.service.WorkUserService; import com.xhpc.activity.vo.SysUserResetPasswordVo; import com.xhpc.common.core.domain.R; +import com.xhpc.common.core.utils.StringUtils; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.page.TableDataInfo; import com.xhpc.common.log.annotation.Log; @@ -30,7 +31,7 @@ public class WorkUserController extends BaseController { @GetMapping("/getPage") public TableDataInfo getPage(HttpServletRequest request, - Integer deptId, + String deptId, String userName, String loginName, String phone, @@ -38,6 +39,10 @@ public class WorkUserController extends BaseController { LoginUser loginUser = logUserUtils.getLogUser(request); startPage(); + if(StringUtils.isNotEmpty(deptId)){ + deptId = deptId.replaceAll("d_", ""); + } + Map params = new HashMap<>(); params.put("tenantId", loginUser.getTenantId()); params.put("deptId", deptId);