From 97c78467e2771db51fcf6bec7ac31b1c9550ded7 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Sat, 29 Jun 2019 20:41:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=93=8D=E4=BD=9C=E3=80=80=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/apiservice/controller/busi/SysUserController.java       | 9 ++++-----
 .../core/apiservice/serviceimpl/busi/SysFileServiceImpl.java     | 2 --
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java
index 5ab8bee..27b8e33 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java
@@ -205,7 +205,7 @@ public class SysUserController extends CoreBaseController{
             ValidatorBean.checkNotZero(status, "用户状态不能为空");
 
             sysUserService.updateSysUserStatus(Long.parseLong(id), status, AuthUtil.getSessionUser());
-            return new ResultBean(true);
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);
         } catch (Exception e) {
@@ -320,7 +320,7 @@ public class SysUserController extends CoreBaseController{
             ValidatorBean.checkNotNull(id, "用户id 不能为空");
 
             sysUserService.deleteSysUserById(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) {
@@ -347,8 +347,7 @@ public class SysUserController extends CoreBaseController{
             }
 
             sysUserService.deleteBatchSysUserById(StringTool.getArrayLong(ids),AuthUtil.getSessionUser());
-            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){
@@ -546,7 +545,7 @@ public class SysUserController extends CoreBaseController{
             sysUser.setOrganizeId(Long.parseLong(organizeIdStr));
 
             sysUserService.updateSysUser(sysUser);
-            return null;
+            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/SysFileServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java
index 2189ccb..ce83b24 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java
@@ -17,9 +17,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient;
 import cn.estsh.impp.framework.boot.fastdfs.FastDFSFile;
-import com.mchange.lang.IntegerUtils;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.beanutils.BeanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;