523096025 hace 1 semana
padre
commit
f07af10d95

+ 4 - 1
app-admin/src/main/java/com/ruoyi/web/controller/system/VillageServiceController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.domain.dto.VillageService.VillageServiceAddRequest;
 import com.ruoyi.web.domain.dto.VillageService.VillageServiceEditRequest;
@@ -22,7 +23,7 @@ import static com.ruoyi.common.core.domain.AjaxResult.success;
 @Api("服务与支持管理")
 @RestController
 @RequestMapping("/system/village/service")
-public class VillageServiceController {
+public class VillageServiceController   {
 
     @Autowired
     private VillageServiceService villageServiceService;
@@ -39,6 +40,8 @@ public class VillageServiceController {
         if (villageServiceAddRequest == null) {
             return error("请求参数为空");
         }
+        System.out.println(villageServiceAddRequest.getContent());
+
         Integer id = villageServiceService.addVillageService(villageServiceAddRequest);
         return success(id);
     }

+ 1 - 1
app-admin/src/main/resources/application.yml

@@ -145,7 +145,7 @@ xss:
   # 过滤开关
   enabled: true
   # 排除链接(多个用逗号分隔)
-  excludes: /system/notice
+  excludes: /system/notice,/system/village/service/add
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
 

+ 3 - 0
app-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -49,6 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from sys_user u
 		left join sys_user_role as ur on u.user_id = ur.user_id
 		left join sys_role r on r.role_id = ur.role_id
+-- 		left join sys_role r on r.role_id = ur.role_id
+        left join sys_role_dept as rd on r.role_id = rd.role_id
+        left join sys_dept d on d.dept_id = rd.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}