菜单权限修改

yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/SysUserPermission.java

@@ -89,8 +89,8 @@ public class SysUserPermission extends BaseEntity {
 	private String deleteFlag;
 
 	/**
-	 * 项目id
+	 * 部门id
 	 */
-	@Schema(description = "项目id")
+	@Schema(description = "部门id")
 	private String domainId;
 }

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/mapper/SysUserPermissionMapper.java

@@ -78,8 +78,8 @@ public interface SysUserPermissionMapper extends BaseMapper<SysUserPermission> {
 	IPage<SysUserDeptVo> selectSettleVO(Page<SysUserDeptVo> page, @Param("name") String name);
 
 	/**
-	 * 根据名项目编码查询id
-	 * 项目权限
+	 * 根据名项目部门查询id
+	 * 部门权限
 	 * @param code 编码
 	 * @return
 	 */

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysUserPermissionServiceImpl.java

@@ -372,7 +372,8 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
 					}
 				}
 				//项目权限的时候赋值项目id
-				if (CommonConstants.FIVE_STRING.equals(insert.getPermissionType())) {
+				if (CommonConstants.EIGHT_STRING.equals(insert.getPermissionType()) ||
+						CommonConstants.NINE_STRING.equals(insert.getPermissionType())) {
 					domainId = baseMapper.selectSettleByCode(insert.getCode());
 					insert.setDomainId(domainId);
 				}

yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysUserPermissionMapper.xml

@@ -157,7 +157,7 @@
 
 	<select id="selectSettleVO" resultMap="nameAndCodeMap">
 		SELECT
-		a.fd_3a37fe508071fe code,a.fd_3a2b38c61ef9aa name,a.fd_id domainId
+		a.fd_3a37fe508071fe code,a.fd_3a2b38c61ef9aa name
 		from ekp_24a8e6a7fc143bb8c48a a
 		where 1=1
 		<if test="name != null and name.trim() != ''">
@@ -165,13 +165,6 @@
 		</if>
 	</select>
 
-	<!--根据项目编码查询id-->
-	<select id="selectSettleByCode" resultType="java.lang.String">
-		SELECT
-		a.fd_id
-		from ekp_24a8e6a7fc143bb8c48a a where a.fd_3a37fe508071fe = #{code} limit 1
-	</select>
-
 	<select id="selectContractSimpleVO" resultMap="nameAndCodeMap">
 		SELECT
 		a.NAME,
@@ -205,14 +198,23 @@
 
 	<select id="selectDeptVO" resultMap="nameAndCodeMap">
 		SELECT
-		a.fd_no code,a.fd_name name
+		a.fd_no code,a.fd_name name,a.fd_id domainId
 		from sys_org_element a
-		where a.fd_is_available = '1' and fd_org_type = 2
+		where a.fd_is_available = '1' and a.fd_org_type = 2
 		<if test="name != null and name.trim() != ''">
 			AND (a.fd_no like concat('%',#{name},'%') or a.fd_name like concat('%',#{name},'%'))
 		</if>
 	</select>
 
+	<!--根据部门编码查询id-->
+	<select id="selectSettleByCode" resultType="java.lang.String">
+		SELECT
+		a.fd_id
+		from sys_org_element a
+		where a.fd_is_available = '1' and a.fd_org_type = 2 and a.fd_no = #{code}
+		limit 1
+	</select>
+
 	<select id="selectDictByType" resultMap="dictMap">
 		SELECT
 		a.dict_id as id,a.name