Merge branch 'tall3' of dd.tall.wiki:ccsens_wiki/ccsenscloud into tall3

common/src/main/java/com/ccsens/common/persist/dao/ProRoleDao.java

@@ -125,4 +125,12 @@ public interface ProRoleDao extends ProRoleMapper {
      * @return 成员信息列表
      */
     List<CRoleVo.MemberOfRoleInfo> queryMemberOfRole(CRoleDto.QueryMemberOfRole param);
+
+    /**
+     * 根据角色名和项目id查询
+     * @param name 角色名称
+     * @param projectId 项目id
+     * @return 角色信息
+     */
+    CRoleVo.RoleInfo queryByName(@Param("name") String name,@Param("projectId") Long projectId);
 }

common/src/main/resources/mapper_dao/ProRoleDao.xml

@@ -242,4 +242,17 @@
         AND rm.role_id = #{roleId}
     </select>
 
+    <select id="queryByName" resultType="com.ccsens.common.bean.vo.CRoleVo$RoleInfo">
+        SELECT
+            r.id,
+            r.`name`
+        FROM
+            t_pro_role r
+        WHERE
+            r.rec_status = 0
+        AND r.project_id = #{projectId}
+        AND r.`name` = #{name}
+        LIMIT 1
+    </select>
+
 </mapper>

signin/src/main/java/com/ccsens/signin/api/DebugController.java

@@ -1,4 +1,4 @@
-package com.ccsens.wisdomcar.api;
+package com.ccsens.signin.api;
 
 import com.ccsens.cloudutil.annotation.CacheMd5;
 import com.ccsens.signin.service.IUserService;