From e96fd395ffb8e859fc369287c7757841ea7f14bb Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Wed, 26 Jun 2019 10:35:19 +0800
Subject: [PATCH] =?UTF-8?q?Excel=20=E5=AF=BC=E5=85=A5=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=B8=85=E7=90=86=E6=95=B0=E6=8D=AE,=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=B9=B3=E5=8F=B0=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/busi/SysEnumController.java           | 20 +++++++++++---------
 .../controller/busi/SysRoleController.java           |  2 +-
 .../apiservice/serviceimpl/busi/SysMenuService.java  |  1 +
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java
index 0d3e2f0..6ecea90 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java
@@ -261,15 +261,7 @@ public class SysEnumController extends CoreBaseController {
                 Arrays.asList(ImppEnumUtil.SYS_VALUE_TYPE.values()));
     }
 
-    /**
-     * @return 处理结果
-     */
-    @GetMapping("/sys-math-symbol")
-    @ApiOperation(value = "数学表达式", notes = "数学表达式")
-    public ResultBean getSysMathSymbol() {
-        return new ResultBean(true, "操作成功",
-                Arrays.asList(CommonEnumUtil.MATH_SYMBOL.values()));
-    }
+
 
     /**
      * @return 处理结果
@@ -303,4 +295,14 @@ public class SysEnumController extends CoreBaseController {
         list.add(ImppEnumUtil.MESSAGE_TYPE.MAIL);
         return new ResultBean(true, "操作成功", list);
     }
+
+    /**
+     * @return 处理结果
+     */
+    @GetMapping("/sys-login-platform")
+    @ApiOperation(value = "数学表达式", notes = "数学表达式")
+    public ResultBean getSysloginPlatforml() {
+        return new ResultBean(true, "操作成功",
+                Arrays.asList(CommonEnumUtil.LOG_LOGIN_PLATFORM.values()));
+    }
 }
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java
index 317b7f7..3e657ee 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java
@@ -116,7 +116,7 @@ public class SysRoleController extends CoreBaseController{
             ValidatorBean.checkNotNull(id, "角色id 不能为空");
 
             sysRoleService.deleteSysRoleById(Long.parseLong(id));
-            return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);
         } catch (Exception e) {
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java
index f7da85b..3549c8a 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java
@@ -178,6 +178,7 @@ public class SysMenuService implements ISysMenuService {
     public List<SysMenu> refreshSysMenu(List<SysMenu> list) {
         LOGGER.info("系统功能 SYS_MENU list :{}", list);
 
+        sysMenuRDao.deleteAll();
         return sysMenuRDao.saveAll(list);
     }