人员选择窗口取消右上角关闭按钮

module-map/src/main/java/ink/wgink/module/map/controller/api/grid/GridGroupController.java

@@ -44,8 +44,8 @@ public class GridGroupController extends DefaultBaseController {
         if (StringUtils.isBlank(gridGroupVO.getGridGroupCode())) {
             throw new ParamsException("编码不能为空");
         }
-        if (!RegexUtil.isLetter(gridGroupVO.getGridGroupCode())) {
+        if (!RegexUtil.isLetterOrNumber(gridGroupVO.getGridGroupCode())) {
-            throw new ParamsException("编码只能是字母");
+            throw new ParamsException("编码只能是字母或数字");
         }
         gridGroupService.save(gridGroupVO);
         return new SuccessResult();

module-map/src/main/resources/templates/grid/grid/user/list.html

@@ -194,6 +194,7 @@
                     title: '选择用户',
                     width: '500px',
                     height: '500px',
+                    closeBtn: 0,
                     onClose: function() {
                         var selectedUsers = top.dialog.dialogData.selectedDepartmentUsers;
                         if(selectedUsers != null && selectedUsers.length > 0) {

service-department/src/main/resources/templates/department/user/list.html

@@ -211,6 +211,7 @@
                     title: '选择用户',
                     width: '500px',
                     height: '500px',
+                    closeBtn: 0,
                     onClose: function() {
                         var selectedUsers = top.dialog.dialogData.selectedDepartmentUsers;
                         if(selectedUsers != null && selectedUsers.length > 0) {

service-group/src/main/resources/templates/group/user/list.html

@@ -210,6 +210,7 @@
                     title: '选择用户',
                     width: '500px',
                     height: '500px',
+                    closeBtn: 0,
                     onClose: function() {
                         var selectedUsers = top.dialog.dialogData.selectedDepartmentUsers;
                         if(selectedUsers != null && selectedUsers.length > 0) {

service-menu/src/main/java/ink/wgink/module/menu/controller/app/MenuAppController.java

@@ -40,7 +40,7 @@ public class MenuAppController extends DefaultBaseController {
     @PostMapping("save")
     public SuccessResult saveMenu(@RequestHeader("token") String token, @RequestBody MenuVO menuVO) {
         checkParams(menuVO);
-        menuService.save(menuVO);
+        menuService.save(token, menuVO);
         return new SuccessResult();
     }
 

service-menu/src/main/java/ink/wgink/module/menu/service/IMenuService.java

@@ -22,6 +22,14 @@ public interface IMenuService extends IMenuBaseService {
      */
     void save(MenuVO menuVO);
 
+    /**
+     * 保存菜单
+     *
+     * @param token
+     * @param menuVO
+     */
+    void save(String token, MenuVO menuVO);
+
     /**
      * 保存菜单
      *
@@ -29,6 +37,15 @@ public interface IMenuService extends IMenuBaseService {
      */
     String saveAndReturnId(MenuVO menuVO);
 
+    /**
+     * 保存菜单
+     *
+     * @param token
+     * @param menuVO
+     * @return
+     */
+    String saveAndReturnId(String token, MenuVO menuVO);
+
     /**
      * 修改菜单
      *
@@ -38,6 +55,15 @@ public interface IMenuService extends IMenuBaseService {
      */
     void update(String menuId, MenuVO menuVO);
 
+    /**
+     * 修改菜单
+     *
+     * @param token
+     * @param menuId
+     * @param menuVO
+     */
+    void update(String token, String menuId, MenuVO menuVO);
+
     /**
      * 菜单删除
      *
@@ -46,4 +72,12 @@ public interface IMenuService extends IMenuBaseService {
      */
     void remove(List<String> ids);
 
+    /**
+     * 删除菜单
+     *
+     * @param token
+     * @param ids
+     */
+    void remove(String token, List<String> ids);
+
 }

service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java

@@ -15,6 +15,7 @@ import ink.wgink.pojo.result.SuccessResultList;
 import ink.wgink.util.ArrayListUtil;
 import ink.wgink.util.UUIDUtil;
 import ink.wgink.util.map.HashMapUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -113,8 +114,18 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService
         saveAndReturnId(menuVO);
     }
 
+    @Override
+    public void save(String token, MenuVO menuVO) {
+        saveAndReturnId(token, menuVO);
+    }
+
     @Override
     public String saveAndReturnId(MenuVO menuVO) {
+        return saveAndReturnId(null, menuVO);
+    }
+
+    @Override
+    public String saveAndReturnId(String token, MenuVO menuVO) {
         Map<String, Object> params = HashMapUtil.beanToMap(menuVO);
         String menuId = UUIDUtil.getUUID();
         String parentCode = null;
@@ -127,24 +138,46 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService
         String menuCode = getCode(parentCode, menuParentId);
         params.put("menuCode", menuCode);
         params.put("menuId", menuId);
-        setSaveInfo(params);
+        if (StringUtils.isBlank(token)) {
+            setSaveInfo(params);
+        } else {
+            setAppSaveInfo(token, params);
+        }
         menuDao.save(params);
         return menuId;
     }
 
     @Override
     public void remove(List<String> ids) {
+        remove(null, ids);
+    }
+
+    @Override
+    public void remove(String token, List<String> ids) {
         Map<String, Object> params = getHashMap(2);
         params.put("menuIds", ids);
-        setUpdateInfo(params);
+        if (StringUtils.isBlank(token)) {
+            setUpdateInfo(params);
+        } else {
+            setAppUpdateInfo(token, params);
+        }
         menuDao.remove(params);
     }
 
     @Override
     public void update(String menuId, MenuVO menuVO) {
+        update(null, menuId, menuVO);
+    }
+
+    @Override
+    public void update(String token, String menuId, MenuVO menuVO) {
         Map<String, Object> params = HashMapUtil.beanToMap(menuVO);
         params.put("menuId", menuId);
-        setUpdateInfo(params);
+        if (StringUtils.isBlank(token)) {
+            setUpdateInfo(params);
+        } else {
+            setAppUpdateInfo(token, params);
+        }
         menuDao.update(params);
     }
 

service-role/src/main/resources/templates/role/user/list.html

@@ -218,6 +218,7 @@
                     title: '选择用户',
                     width: '500px',
                     height: '500px',
+                    closeBtn: 0,
                     onClose: function() {
                         var selectedUsers = top.dialog.dialogData.selectedDepartmentUsers;
                         if(selectedUsers != null && selectedUsers.length > 0) {