更新！

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

@@ -13,9 +13,9 @@ import java.util.List;
  */
 public interface DepartmentService {
 
-    public ResultContent addDepartment(DepartmentParam param);
+    ResultContent addDepartment(DepartmentParam param);
 
-    public ResultContent<List<ITree>> getDepartmentTree(String oid);
+    ResultContent<List<ITree>> getDepartmentTree(String oid);
 
     // 查询所有上级部门
     List<DepartmentModel> getParents(String id);

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

@@ -167,6 +167,7 @@ public class OrganizationUserController {
     }
 
     //----------------------- 用户注册 start------------------
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "小程序注册用户", description = "小程序注册用户")
     @RequestMapping(value = {"registerProjectUser"}, method = {RequestMethod.POST})

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

@@ -167,19 +167,19 @@ public class DevicePermissOpenApiService extends SuperService {
      * @return
      */
     public ResultContent deletePermiss(PermissChangeOpenApiParam param) {
-        if (StringUtils.isEmpty(param.getProjectCode())) {
-            return ResultContent.buildFail("projectCode不能为空");
+        // 检查项目信息
+        ResultContent<String> resultContent = commonService.checkProjectCanUserByCode(param.getProjectCode());
+        if (resultContent.isFailed()) {
+            return ResultContent.buildFail(resultContent.getMsg());
         }
+        String projectOid = resultContent.getContent();
+
         if (StringUtils.isEmpty(param.getUserId())) {
             return ResultContent.buildFail("userId不能为空");
         }
         if (StringUtils.isEmpty(param.getDeviceId())) {
             return ResultContent.buildFail("deviceId不能为空");
         }
-        String projectOid = getOidByCode(param.getProjectCode());
-        if (StringUtils.isEmpty(projectOid)) {
-            return ResultContent.buildFail("projectCode不存在");
-        }
         DevicePermiss entity = devicePermissDao.findTopByUserIdAndDeviceIdAndProjectOid(param.getUserId(), param.getDeviceId(), projectOid);
         if (ObjectUtils.isEmpty(entity)) {
             return ResultContent.buildFail("权限不存在");
@@ -216,6 +216,8 @@ public class DevicePermissOpenApiService extends SuperService {
         if (ObjectUtils.isEmpty(orgUsers)) {
             return ResultContent.buildFail("用户不属于项目");
         }
+
+        // 组装数据
         DevicePermissParam saveParam = new DevicePermissParam();
         saveParam.setDeviceIds(List.of(param.getDeviceId()));
         saveParam.setProjectOid(projectOid);
@@ -230,11 +232,14 @@ public class DevicePermissOpenApiService extends SuperService {
      * @return
      */
     public ResultContent<List<DevicePermissOpenApiModel>> getDevicePermissByUserId(UserOpenApiParam param) {
-        if (StringUtils.isEmpty(param.getProjectCode())) {
-            return ResultContent.buildFail("projectCode不能为空");
+        // 检查项目信息
+        ResultContent<String> resultContent = commonService.checkProjectCanUserByCode(param.getProjectCode());
+        if (resultContent.isFailed()) {
+            return ResultContent.buildFail(resultContent.getMsg());
         }
+        String projectOid = resultContent.getContent();
+
         List<DevicePermissOpenApiModel> models = new ArrayList<>();
-        String projectOid = getOidByCode(param.getProjectCode());
         if (StringUtils.isNotEmpty(projectOid)) {
             List<DevicePermiss> list = devicePermissDao.findByUserIdAndProjectOid(param.getUserId(), projectOid);
             if (ObjectUtils.isNotEmpty(list)) {

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

@@ -1,6 +1,7 @@
 package com.zhongshu.card.server.core.service.openAPI.face;
 
 import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.projectAbout.orgFace.OrgUserFaceModel;
 import com.zhongshu.card.client.model.projectAbout.orgFace.OrgUserFaceParam;
 import com.zhongshu.card.client.openApi.model.face.OrgUserFaceOpenApiParam;
 import com.zhongshu.card.client.openApi.model.face.OrgUserFaceOpenModel;
@@ -45,7 +46,7 @@ public class OrgUserFaceOpenService {
     @Autowired
     private OrgUserFaceDao orgUserFaceDao;
 
-    public ResultContent saveFace(OrgUserFaceOpenApiParam param) {
+    public ResultContent<OrgUserFaceModel> saveFace(OrgUserFaceOpenApiParam param) {
         if (StringUtils.isEmpty(param.getUserId())) {
             return ResultContent.buildFail("userId 不能为空");
         }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/OrgUserFaceService.java

@@ -83,7 +83,7 @@ public class OrgUserFaceService extends SuperService {
      * @param param
      * @return
      */
-    public ResultContent saveFace(OrgUserFaceParam param) {
+    public ResultContent<OrgUserFaceModel> saveFace(OrgUserFaceParam param) {
         // 编辑 先删除
         if (StringUtils.isNotEmpty(param.getId())) {
             ResultContent resultContent = deleteFace(param.getId(), false);