cs

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationUserSearch.java

@@ -52,4 +52,7 @@ public class OrganizationUserSearch extends SuperSearch {
     @Schema(description = "角色ID集合")
     private List<String> roleIds;
 
+    @Schema(description = "是否是搜索项目的用户")
+    private Boolean isSearchProject = Boolean.FALSE;
+
 }

FullCardClient/src/main/java/com/zhongshu/card/client/service/org/UserAccountService.java

@@ -68,7 +68,6 @@ public interface UserAccountService {
             @Parameter(hidden = true) @PageableDefault Pageable pageable
     );
 
-    ResultContent updateUserAccountInfo(UserCountUpdateBaseParam param);
 
 
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/OrganizationUserController.java

@@ -9,6 +9,7 @@ import com.zhongshu.card.client.model.org.*;
 import com.zhongshu.card.client.model.orgModel.OrgBindUserAllParam;
 import com.zhongshu.card.client.model.project.ProjectSaveParam;
 import com.zhongshu.card.client.service.org.OrganizationService;
+import com.zhongshu.card.client.service.org.UserAccountService;
 import com.zhongshu.card.server.core.model.org.OrgBindUserParam;
 import com.zhongshu.card.server.core.service.org.OrganizationUserServiceImpl;
 import io.swagger.v3.oas.annotations.Operation;
@@ -25,13 +26,23 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("organization")
-@Tag(name = "机构管理")
+@RequestMapping("organizationUser")
+@Tag(name = "机构管理-用户管理")
 public class OrganizationUserController {
 
     @Autowired
     private OrganizationUserServiceImpl organizationUserService;
 
+    @Autowired
+    private UserAccountService userAccountService;
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "机构保存用户", description = "机构保存用户")
+    @RequestMapping(value = {"saveOrgUser"}, method = {RequestMethod.POST})
+    public ResultContent saveOrgUser(@RequestBody UserCountAddParam param) {
+        return organizationUserService.saveOrgUser(param);
+    }
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @Operation(summary = "机构绑定用户", description = "机构绑定用户，机构已存在 用户已存在")
@@ -40,4 +51,23 @@ public class OrganizationUserController {
         return this.organizationUserService.orgBindUser(param);
     }
 
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "项目用户列表-分页查询", description = "项目用户列表-分页查询")
+    @RequestMapping(value = {"projectUserPage"}, method = {RequestMethod.POST})
+    public ResultContent<Page<OrganizationUserModel>> projectUserPage(
+            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
+            @Parameter(required = false) OrganizationUserSearch param) {
+        // 项目用户 包括项目下所有的机构的用户
+        param.setIsSearchProject(Boolean.TRUE);
+        Assert.hasText(param.getProjectOid(), "projectOid不能为空");
+        return userAccountService.pageOrgUser(param, pageable);
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "机构用户详情", description = "平台用户详情")
+    @RequestMapping(value = {"getOrgUserDetail"}, method = {RequestMethod.POST})
+    public ResultContent getOrgUserDetail(@RequestBody OrgUserDetailParam param) {
+        return userAccountService.getOrgUserDetail(param);
+    }
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/user/UserInfoController.java

@@ -4,6 +4,7 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.AuthTypeParam;
+import com.zhongshu.card.client.model.base.UserIdModel;
 import com.zhongshu.card.client.model.org.*;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.service.org.OrganizationService;
@@ -72,6 +73,14 @@ public class UserInfoController {
         return userAccountService.updatePassWord(param);
     }
 
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "重置用户密码", description = "重置用户密码（重置为默认密码）")
+    @RequestMapping(value = {"resetPassWord"}, method = {RequestMethod.POST})
+    public ResultContent resetPassWord(@RequestBody UserIdModel param) {
+        Assert.hasText(param.getUserId(), "userId不能为空");
+        return userAccountService.resetPassWord(param);
+    }
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "修改用户头像", description = "修改用户头像")
     @RequestMapping(value = {"updateUserHead"}, method = {RequestMethod.GET})

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/user/UserManagerController.java

@@ -35,32 +35,6 @@ public class UserManagerController {
     @Autowired
     UserAccountService userAccountService;
 
-    @Autowired
-    OrganizationUserServiceImpl organizationUserService;
-
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "机构用户列表-分页查询", description = "机构用户列表-分页查询")
-    @RequestMapping(value = {"pageOrgUser"}, method = {RequestMethod.POST})
-    public ResultContent<Page<OrganizationUserModel>> page(
-            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-            @Parameter(required = false) OrganizationUserSearch param) {
-        return userAccountService.pageOrgUser(param, pageable);
-    }
-
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "添加-编辑机构用户", description = "添加-编辑机构用户")
-    @RequestMapping(value = {"update"}, method = {RequestMethod.POST})
-    public ResultContent update(@RequestBody UserCountAddParam param) {
-        return organizationUserService.saveOrgUser(param);
-    }
-
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "平台用户详情", description = "平台用户详情")
-    @RequestMapping(value = {"getOrgUserDetail"}, method = {RequestMethod.POST})
-    public ResultContent getOrgUserDetail(@RequestBody OrgUserDetailParam param) {
-        return userAccountService.getOrgUserDetail(param);
-    }
-
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "删除机构用户", description = "删除机构用户")
     @RequestMapping(value = {"deleteOrgUser"}, method = {RequestMethod.POST})
@@ -85,20 +59,4 @@ public class UserManagerController {
         return userAccountService.list(param, pageable);
     }
 
-
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "重置用户密码", description = "重置用户密码（重置为默认密码）")
-    @RequestMapping(value = {"resetPassWord"}, method = {RequestMethod.POST})
-    public ResultContent resetPassWord(@RequestBody UserIdModel param) {
-        Assert.hasText(param.getUserId(), "userId不能为空");
-        return userAccountService.resetPassWord(param);
-    }
-
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "编辑用户信息", description = "编辑用户信息")
-    @RequestMapping(value = {"updateUserAccountInfo"}, method = {RequestMethod.POST})
-    public ResultContent updateUserAccountInfo(@RequestBody UserCountUpdateBaseParam param) {
-        return userAccountService.updateUserAccountInfo(param);
-    }
-
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/extend/OrganizationUserDaoExtend.java

@@ -11,5 +11,7 @@ import org.springframework.data.domain.Pageable;
  * @Version: 1.0
  */
 public interface OrganizationUserDaoExtend {
+
     Page<OrganizationUser> page(Pageable pageable, OrganizationUserSearch param);
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/impl/OrganizationUserDaoImpl.java

@@ -46,7 +46,7 @@ public class OrganizationUserDaoImpl extends BaseImpl implements OrganizationUse
 
     @Override
     public Page<OrganizationUser> page(Pageable pageable, OrganizationUserSearch param) {
-        Criteria criteria = new Criteria();
+        Criteria criteria = buildCriteriaNotOid(param);
 
         // 用户ID
         if (ObjectUtils.isNotEmpty(param.getUserId())) {
@@ -78,20 +78,23 @@ public class OrganizationUserDaoImpl extends BaseImpl implements OrganizationUse
             criteria.and("position.id").is(param.getPositionId());
         }
 
+        // 角色
         List<String> roleIds = param.getRoleIds();
         if (!CollectionUtils.isEmpty(roleIds)) {
             List<Role> roles = roleDao.findByIdIn(roleIds);
             criteria.and("roles").in(roles);
         }
 
+        // 部门
         List<String> departmentIds = param.getDepartmentIds();
         if (!CollectionUtils.isEmpty(departmentIds)) {
             List<Department> roles = departmentDao.findByIdIn(departmentIds);
             criteria.and("departments").in(roles);
         }
 
-        if (!CommonUtil.longIsEmpty(param.getStartTime()) && !CommonUtil.longIsEmpty(param.getEndTime())) {
-            criteria.and("createTime").gte(param.getStartTime()).and("createTime").lte(param.getEndTime());
+        // 搜索项目的用户
+        if (param.getIsSearchProject() != null && param.getIsSearchProject()) {
+            criteria.and("projectOid").is(param.getProjectOid());
         }
 
         // 模糊搜索
@@ -117,11 +120,9 @@ public class OrganizationUserDaoImpl extends BaseImpl implements OrganizationUse
         // 关键字搜索
         if (StringUtils.isNotEmpty(param.getKeyWord())) {
             Pattern pattern = Pattern.compile("^.*" + param.getKeyWord() + ".*$");
-            criteria.orOperator(Criteria.where("name").regex(pattern),
-                    Criteria.where("phone").regex(pattern));
+            criteria.orOperator(Criteria.where("name").regex(pattern), Criteria.where("phone").regex(pattern));
         }
 
-        criteria.and("isDelete").is(Boolean.FALSE);
         Sort sort = buildSort(param);
         Query query = Query.query(criteria);
         query.with(sort);

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/openAPI/OpenAPIRegisterService.java

@@ -32,12 +32,12 @@ public class OpenAPIRegisterService {
     public ResultContent initRegisterPAIS() {
         String str = restTemplate.getForObject("http://" + serviceId + "/v3/api-docs", String.class);
         List<JSONObject> openAPIS = OpenAPIScan.scanAPI(str);
-        ResultContent content = restTemplate.postForObject("http://opengateway/v3/api-docs", openAPIS, ResultContent.class);
-        if (content.isFailed()) {
-            log.info("openApi注册错误: {}", content.getMsg());
-        } else {
-            log.info("openApi注册成功");
-        }
+//        ResultContent content = restTemplate.postForObject("http://opengateway/v3/api-docs", openAPIS, ResultContent.class);
+//        if (content.isFailed()) {
+//            log.info("openApi注册错误: {}", content.getMsg());
+//        } else {
+//            log.info("openApi注册成功");
+//        }
         str = null;
         return ResultContent.buildSuccess();
     }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/user/UserAccountServiceImpl.java

@@ -377,7 +377,7 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
      */
     @Override
     public ResultContent<Page<OrganizationUserModel>> pageOrgUser(OrganizationUserSearch param, Pageable pageable) {
-        initOidSearchParam(param);
+        initSearchParam(param);
         Page<OrganizationUser> page = organizationUserDao.page(pageable, param);
         return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toOrgUserModel));
     }
@@ -490,24 +490,6 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
         return ResultContent.buildSuccess(PageEntityUtil.toPageModel(page, this::toModel));
     }
 
-    /**
-     * 编辑用户基本信息
-     *
-     * @param param
-     * @return
-     */
-    @Override
-    public ResultContent updateUserAccountInfo(UserCountUpdateBaseParam param) {
-        UserAccount userAccount = userCountDao.findTopById(param.getId());
-        if (ObjectUtils.isEmpty(userAccount)) {
-            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, param.getId()));
-        }
-        BeanUtils.copyProperties(param, userAccount);
-        userAccount.setSpellCode(CommonUtil.getPinyin(userAccount.getName()));
-        userCountDao.save(userAccount);
-        return ResultContent.buildSuccess();
-    }
-
     /**
      * 查询用户列表
      *