Merge remote-tracking branch 'origin/MVP1.5.8' into MVP1.5.8

yifu-msg/yifu-msg-biz/src/main/resources/mapper/MsgInfoMapper.xml

@@ -133,7 +133,7 @@
 			e.fd_fact_node_id = 'N5'
 		AND b1.fd_id IS NOT NULL
 		) x
-		where x.date1 > date2 GROUP BY x.ORDER_NO
+		where x.date1 >= date2 GROUP BY x.ORDER_NO
 	</select>
 
 	<select id="getMsgByTaskOne"  resultMap="msgInfoMap">

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/controller/SysUserPermissionController.java

@@ -35,7 +35,6 @@ public class SysUserPermissionController {
 
 	private final SysUserPermissionService sysUserPermissionService;
 
-
 	/**
 	 * 简单分页查询
 	 *
@@ -144,12 +143,12 @@ public class SysUserPermissionController {
 	}
 
 	/**
-	 * 名称，编码模糊搜索
+	 * 根据类型查询字典值
 	 *
 	 * @param type 字典类型
 	 * @return
 	 */
-	@Operation(description = "根据名称，编码模糊搜索")
+	@Operation(description = "根据类型查询字典值")
 	@PostMapping("/selectDictByType")
 	public R<List<SysDictVo>> selectDictByType(@RequestParam String type) {
 		return new R<>(sysUserPermissionService.selectDictByType(type));

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

@@ -93,6 +93,14 @@ public interface SysUserPermissionMapper extends BaseMapper<SysUserPermission> {
 	 */
 	IPage<SysUserDeptVo> selectQuotationVO(Page<SysUserDeptVo> page, @Param("name") String name);
 
+	/**
+	 * 根据名称或者编码查询数据
+	 * 部门&&收入归属权限
+	 * @param name 名称
+	 * @return
+	 */
+	IPage<SysUserDeptVo> selectDeptVO(Page<SysUserDeptVo> page, @Param("name") String name);
+
 	List<SysDictVo> selectDictByType(@Param("type") String type);
 }
 

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

@@ -115,6 +115,9 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
 				} else {
 					iPage = baseMapper.selectContractSimpleVO(page, searchVo.getName(),searchVo.getName(),searchVo.getType());
 				}
+			} else if (CommonConstants.EIGHT_STRING.equals(searchVo.getType()) || CommonConstants.NINE_STRING.equals(searchVo.getType())) {
+				//部门&&收入归属权限
+				iPage = baseMapper.selectDeptVO(page, searchVo.getName());
 			} else {
 				//项目权限
 				if (CommonConstants.ONE_STRING.equals(user.getId())) {

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

@@ -195,6 +195,16 @@
 		</if>
 	</select>
 
+	<select id="selectDeptVO" resultMap="nameAndCodeMap">
+		SELECT
+		a.fd_no code,a.fd_name name
+		from sys_org_element a
+		where a.fd_is_available = '1' and 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>
+
 	<select id="selectDictByType" resultMap="dictMap">
 		SELECT
 		a.dict_id as id,a.name