注册业务

common/src/main/java/com/diagbot/exception/CommonErrorCode.java

@@ -18,7 +18,8 @@ public enum CommonErrorCode implements ErrorCode {
     UPDATE_INFO_FAIL("00020003", "更新数据失败!"),
     PARAM_IS_NULL("00020004", "传入的参数为空!"),
     PARAM_IS_ERROR("00020005", "传入的参数为错误!"),
-    STATUS_IS_ERROR("00020006", "参数状态错误!");
+    STATUS_IS_ERROR("00020006", "参数状态错误!"),
+    SERVER_IS_ERROR("00020000", "各自业务错误!");
 
     private String code;
     private String msg;

uaa-service/src/main/resources/mapper/PermissionMapper.xml

@@ -19,10 +19,10 @@
     <select id="getByUserId" parameterType="java.lang.Long" resultType="com.diagbot.entity.Permission">
       select p.*
 		from sys_user u
-        LEFT JOIN sys_user_role sru on u.id= sru.user_id
-        LEFT JOIN sys_role r on sru.role_id=r.id
-        LEFT JOIN sys_role_permission srp on srp.role_id=r.id
-        LEFT JOIN sys_permission p on p.id =srp.permission_id
-        where u.id=#{userId}
+        LEFT JOIN sys_user_role sru on u.id= sru.user_id and sru.is_deleted = 'N'
+        LEFT JOIN sys_role_menu srp on srp.role_id=sru.role_id and srp.is_deleted = 'N'
+        LEFT JOIN sys_menu_permission mp on mp.menu_id =srp.menu_id and mp.is_deleted = 'N'
+				LEFT JOIN sys_permission p on p.id =mp.permission_id and p.is_deleted = 'N'
+        where u.id= #{userId} and u.is_deleted = 'N'
  </select>
 </mapper>

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -110,6 +110,14 @@ public class UserFacade extends UserServiceImpl {
             orgId = org.getId();
         } else {
             orgId = list.get(0).getId();
+            //查询机构下是否已存在用户信息，如已存在，就抛异常,需求待核实
+            Map paramMap1 = new HashMap();
+            paramMap1.put("organization_id", orgId);
+            paramMap1.put("is_deleted", "N");
+            List<UserOrganization> res1 = userOrganizationMapper.selectByMap(paramMap1);
+            if(ListUtil.isNotEmpty(res1)) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该机构下已存在用户，不能再添加别的用户！");
+            }
         }
 
         UserOrganization userOrganization = new UserOrganization();