fix --根据测试xmind文档(自测功能)

server/src/main/java/com/pica/cloud/account/account/server/controller/HospitalSaasRoleController.java

@@ -21,12 +21,13 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(description = "机构saas角色资源")
 @RestController
+@RequestMapping("/hospital")
 public class HospitalSaasRoleController extends AccountBaseController {
     @Autowired
     HospitalSaasRoleService hospitalSaasRoleService;
 
     @ApiOperation("机构saas角色-新增或更新")
-    @PostMapping(value = "/hospital/role/insertAndModify")
+    @PostMapping(value = "/role/insertAndModify")
     @EnabledLoginValidate
     public PicaResponse<Integer> insertAndModify(@Validated @RequestBody HospitalRoleDetailReq req) {
         PicaUser user = fetchPicaUser();
@@ -34,7 +35,7 @@ public class HospitalSaasRoleController extends AccountBaseController {
     }
 
     @ApiOperation("机构saas角色-删除")
-    @DeleteMapping(value = "/hospital/role/delete/{id}")
+    @DeleteMapping(value = "/role/delete/{id}")
     @EnabledLoginValidate
     public PicaResponse<Integer> delete(@PathVariable("id") Long id) {
         PicaUser user = fetchPicaUser();
@@ -42,7 +43,7 @@ public class HospitalSaasRoleController extends AccountBaseController {
     }
 
     @ApiOperation("机构saas平台角色列表")
-    @PostMapping(value = "/hospital/role/listByPage")
+    @PostMapping(value = "/role/listByPage")
     @EnabledLoginValidate
     public PicaResponse<HospitalRoleResp> listByPage(@RequestBody HospitalRoleListReq req) {
         HospitalRoleResp hospitalRoleResp = hospitalSaasRoleService.listByPage(req);
@@ -51,7 +52,7 @@ public class HospitalSaasRoleController extends AccountBaseController {
 
 
     @ApiOperation("机构saas角色-角色详情")
-    @GetMapping(value = "/hospital/role/getRoleDetail/{id}")
+    @GetMapping(value = "/role/getRoleDetail/{id}")
     @EnabledLoginValidate
     public PicaResponse<HospitalRoleDetailDto> getRoleDetail(@PathVariable("id") Long id) {
         return PicaResponse.toResponse(hospitalSaasRoleService.getRoleDetail(id));

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

@@ -39,7 +39,7 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
             throw new PicaWarnException(PicaResultCode.DATA_EXCEPTION.code(), "姓名长度≤16字符");
         }
 
-        if (StringUtils.isEmpty(req.getRemark()) || req.getName().trim().length() > 100) {
+        if (StringUtils.isNotEmpty(req.getRemark()) && req.getName().trim().length() > 100) {
             throw new PicaWarnException(PicaResultCode.DATA_EXCEPTION.code(), "备注长度≤100字符");
         }
 
@@ -87,7 +87,8 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
         map.put("pageSize", req.getPageSize());
         List<HospitalRoleDto> roleDtos = permissionRoleMapper.listByPage(map);
         for (HospitalRoleDto roleDto : roleDtos) {
-            if (Objects.equals(roleDto.getRoleId(), SaasRoleEnum.SAAS_MAIN_ADMIN.getCode())) {
+            if (Objects.equals(roleDto.getRoleId(), SaasRoleEnum.SAAS_MAIN_ADMIN.getCode()) ||
+                    Objects.equals(roleDto.getRoleId(), SaasRoleEnum.SAAS_DOCTOR.getCode())) {
                 roleDto.setAdminSaasFlag(1);
             }
         }

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

@@ -151,7 +151,7 @@
             )
         </if>
         <if test="name != null and  name != ''">
-            and pr.role_name like concat(trim(#{name,jdbcType=VARCHAR}),'%')
+            and pr.role_name like concat(#{name,jdbcType=VARCHAR},'%')
         </if>
     </sql>