新增用户角色

server/src/main/java/com/pica/cloud/account/account/server/mapper/SaaSMenuMapper.java

@@ -24,5 +24,5 @@ public interface SaaSMenuMapper {
 
     int deleteByRoleId(Map<String, Object> map);
 
-    SaaSMenu selectByRoleIdUrl (SaaSMenu record);
+    SaaSMenu selectByRoleIdParentId (SaaSMenu record);
 }
\ No newline at end of file

server/src/main/java/com/pica/cloud/account/account/server/service/impl/HospitalSaasRoleServiceImpl.java

@@ -85,9 +85,12 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
                     saaSMenuMapper.insert(saaSMenu);
                 } else {
                     // 查询父ID
-                    saaSMenu.setPermissionRoleId(String.valueOf(role.getId()));
-                    SaaSMenu saaSMenu1 = saaSMenuMapper.selectByRoleIdUrl(saaSMenu);
+                    SaaSMenu sMenu = new SaaSMenu();
+                    sMenu.setPermissionRoleId(String.valueOf(role.getId()));
+                    sMenu.setParentId(saaSMenu.getParentId());
+                    SaaSMenu saaSMenu1 = saaSMenuMapper.selectByRoleIdParentId(sMenu);
                     saaSMenu.setParentId(saaSMenu1.getId());
+                    saaSMenu.setPermissionRoleId(String.valueOf(role.getId()));
                     saaSMenu.setModifyId(user.getId());
                     saaSMenu.setModifyTime(new Date());
                     saaSMenu.setCreatTime(new Date());

server/src/main/resources/mybatis/SaaSMenuMapper.xml

@@ -258,12 +258,12 @@
         where id = #{id,jdbcType=INTEGER}
     </update>
 
-    <select id="selectByRoleIdUrl" resultMap="BaseResultMap" parameterType="com.pica.cloud.account.account.server.entity.SaaSMenu">
+    <select id="selectByRoleIdParentId" resultMap="BaseResultMap" parameterType="com.pica.cloud.account.account.server.entity.SaaSMenu">
         select
         <include refid="Base_Column_List"/>
-        from p_saas_menu
-        where permission_role_id = #{permissionRoleId,jdbcType=VARCHAR} and delete_flag = 1
-        and url = #{url}
+        from p_saas_menu psm1
+        where psm1.permission_role_id = #{permissionRoleId,jdbcType=VARCHAR} and psm1.delete_flag = 1
+        and exists (select id from p_saas_menu psm2 where psm2.id = #{parentId} and psm2.delete_flag = 1 and psm1.name = psm2.name)
     </select>
 
 </mapper>
\ No newline at end of file

server/src/test/java/com/pica/cloud/account/account/server/service/HospitalSaasRoleServiceTest.java

+package com.pica.cloud.account.account.server.service;
+
+import com.pica.cloud.account.account.server.App;
+import com.pica.cloud.account.account.server.req.HospitalRoleDetailReq;
+import com.pica.cloud.foundation.utils.entity.PicaUser;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.junit.Assert.*;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = App.class)
+public class HospitalSaasRoleServiceTest {
+
+    @Autowired
+    private HospitalSaasRoleService hospitalSaasRoleService;
+
+    @Test
+    public void insertAndModify() {
+        HospitalRoleDetailReq req = new HospitalRoleDetailReq();
+        req.setName("测试");
+        PicaUser user = new PicaUser();
+        user.setId(1);
+        hospitalSaasRoleService.insertAndModify(req, user);
+
+    }
+}
\ No newline at end of file