Prechádzať zdrojové kódy

人员扩展修改需求

luowei 2 rokov pred
rodič
commit
b72b253dd1

+ 19 - 0
project_data/sql/0.0.2/soc/soc.sql

@@ -1055,8 +1055,27 @@ DELIMITER ;
 CALL add_column_if_not_exists();
 DROP PROCEDURE add_column_if_not_exists;
 
+//
+DELIMITER $$
+CREATE PROCEDURE add_column_if_not_exists()
+BEGIN
+  IF NOT EXISTS (
+      SELECT *
+      FROM INFORMATION_SCHEMA.COLUMNS
+      WHERE TABLE_NAME = 'sys_user'
+      AND COLUMN_NAME = 'is_manage'
+  )
+  THEN
+ALTER TABLE sys_user
+    ADD COLUMN `is_manage` VARCHAR(2) DEFAULT NULL COMMENT '是否管理人员:Y是,N否';
+END IF;
+END$$
+DELIMITER ;
 
 
+CALL add_column_if_not_exists();
+DROP PROCEDURE add_column_if_not_exists;
+
 /*
  Navicat Premium Data Transfer
 

+ 2 - 1
soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUser.java

@@ -54,7 +54,8 @@ public class SysUser extends BaseEntity {
      */
     @ApiModelProperty(value = "启用/禁用")
     private String isLock;
-
+    @ApiModelProperty(value = "是否管理员")
+    private String isManage;
     /**
      * 岗位
      */

+ 6 - 2
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -88,7 +88,11 @@ public class SysUserController extends BaseController {
 
         ajax.put("data", sysUserTableDataInfo);
         boolean admin = false;
-        String s = roleService.selectRoleNameByUserId(SecurityUtils.getUserId());
+        SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+        if (null!=sysUser&&"Y".equals(sysUser.getIsManage())){
+            admin=true;
+        }
+ /*       String s = roleService.selectRoleNameByUserId(SecurityUtils.getUserId());
         if (StringUtils.isNotEmpty(s)) {
             int i = s.indexOf(",");
 
@@ -103,7 +107,7 @@ public class SysUserController extends BaseController {
             } else if (s.endsWith("管理人员") || s.equals("超级管理员")) {
                 admin = true;
             }
-        }
+        }*/
 
         ajax.put("check", admin);
         return ajax;