Pārlūkot izejas kodu

用户分配角色

hfy 3 mēneši atpakaļ
vecāks
revīzija
b7a8eb27a6

+ 7 - 0
src/main/java/com/jeesite/modules/mes/web/EmpUserCustomController.java

@@ -173,11 +173,18 @@ public class EmpUserCustomController extends BaseController {
             }
             bindSelectedEmployeeUser(empUser, selectedEmployee);
             userService.save(empUser);
+            if (shouldSaveAuth(request)) {
+                userService.saveAuth(empUser);
+            }
             return renderResult(Global.TRUE, "保存用户 '" + empUser.getLoginCode() + "' 成功");
         }
         return empUserController.save(empUser, oldLoginCode, request);
     }
 
+    private boolean shouldSaveAuth(HttpServletRequest request) {
+        return "auth".equals(request.getParameter("op")) || request.getParameterMap().containsKey("userRoleString");
+    }
+
     @RequestMapping(value = "exportData")
     public void exportData(EmpUser empUser, String ctrlPermi, String ctrlPermiFilter, HttpServletResponse response) {
         if (empUser.getEmployee() != null) {

+ 6 - 6
src/main/resources/config/application.yml

@@ -163,13 +163,13 @@ jdbc:
   # Mysql 数据库配置
   type: mysql
   driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_dy?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+ # url: jdbc:mysql://127.0.0.1:3306/mes_cloud_dy?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 #  url: jdbc:mysql://127.0.0.1:3306/mes_cloude_npd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#  url: jdbc:mysql://192.168.9.181:3306/mes_cloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#  username: mes_cloud
-#  password: s2ENj7KaEySTC7dW
-  username: root
-  password: root
+  url: jdbc:mysql://192.168.9.181:3306/mes_cloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+  username: mes_cloud
+  password: s2ENj7KaEySTC7dW
+#  username: root
+ # password: root
   testSql: SELECT 1
 
   #  # Oracle 数据库配置(若使用 12c,请修改 /modules/core/pom.xml 文件,打开 12c 依赖,去掉 11g 依赖)