From a252110417b80953bf312615b112ebfd53e76f3b Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Tue, 12 Oct 2021 11:33:20 +0800
Subject: [PATCH] =?UTF-8?q?common=20-=20=E6=B7=BB=E5=8A=A0=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/common/persist/dao/ProRoleDao.java   |  8 ++++++++
 common/src/main/resources/mapper_dao/ProRoleDao.xml | 13 +++++++++++++
 .../java/com/ccsens/signin/api/DebugController.java |  2 +-
 signin/src/main/resources/application.yml           |  4 ++--
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/ccsens/common/persist/dao/ProRoleDao.java b/common/src/main/java/com/ccsens/common/persist/dao/ProRoleDao.java
index 3f4336ec..58200a33 100644
--- a/common/src/main/java/com/ccsens/common/persist/dao/ProRoleDao.java
+++ b/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);
 }
diff --git a/common/src/main/resources/mapper_dao/ProRoleDao.xml b/common/src/main/resources/mapper_dao/ProRoleDao.xml
index 3e23afb4..7cc5b69e 100644
--- a/common/src/main/resources/mapper_dao/ProRoleDao.xml
+++ b/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>
\ No newline at end of file
diff --git a/signin/src/main/java/com/ccsens/signin/api/DebugController.java b/signin/src/main/java/com/ccsens/signin/api/DebugController.java
index 4cce4b99..4d845945 100644
--- a/signin/src/main/java/com/ccsens/signin/api/DebugController.java
+++ b/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;
diff --git a/signin/src/main/resources/application.yml b/signin/src/main/resources/application.yml
index e75cc2c3..b5408a3a 100644
--- a/signin/src/main/resources/application.yml
+++ b/signin/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: prod
-    include: util-prod,common
+    active: dev
+    include: util-dev,common