Merge branch 'dev' of trick9191/wlyy2.0 into dev

svr/svr-base/src/main/java/com/yihu/jw/base/dao/role/RoleDao.java

@@ -15,4 +15,6 @@ public interface RoleDao extends PagingAndSortingRepository<RoleDO, String>, Jpa
    RoleDO findByCode(String code);
    List<RoleDO> findByNameAndStatus(String name,Integer status);
    List<RoleDO> findByNameAndSaasIdAndStatus(String name,String saasId,Integer status);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/RoleEndpoint.java

@@ -134,7 +134,10 @@ public class RoleEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.Role.findRoleNameExist)
    @ApiOperation(value = "判断角色是否存在")
    public ObjEnvelop<Boolean> findRoleNameExist(@ApiParam(name = "name", value = "角色名称")
                                     @RequestParam(value = "name", required = false)String name) {
        return success(BaseRequestMapping.Role.api_success,roleService.findRoleNameExist(name));
                                                 @RequestParam(value = "name", required = true)String name,
                                                 @ApiParam(name = "saasId", value = "租户id")
                                                 @RequestParam(value = "saasId", required = false)String saasId) {
        return success(BaseRequestMapping.Role.api_success,roleService.findRoleNameExist(name,saasId));
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/role/RoleService.java

@@ -7,6 +7,7 @@ import com.yihu.jw.entity.base.role.RoleMenuDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -43,10 +44,17 @@ public class RoleService extends BaseJpaService<RoleDO, RoleDao> {
        return Envelop.getSuccess(BaseRequestMapping.Role.api_success);
    }
    public Boolean findRoleNameExist(String name){
        List<RoleDO> list = roleDao.findByNameAndStatus(name,1);
        if(list!=null&&list.size()>0){
            return true;
    public Boolean findRoleNameExist(String name,String saasId){
        if(StringUtils.isNotBlank(saasId)){
            List<RoleDO> list = roleDao.findByNameAndSaasIdAndStatus(name,saasId,1);
            if(list!=null&&list.size()>0){
                return true;
            }
        }else{
            List<RoleDO> list = roleDao.findByNameAndStatus(name,1);
            if(list!=null&&list.size()>0){
                return true;
            }
        }
        return false;
    }