自动填充信息Bug 修复

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java

@@ -86,5 +86,5 @@ public interface ISysMessageService {
      * @param sysMessage
      * @return
      */
-    void sendSysMessage(SysMessage sysMessage);
+    void doSendSysMessage(SysMessage sysMessage);
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java

@@ -43,12 +43,12 @@ public class DemoCloudController {
             LOGGER.error("XXXX --> post调用出错：" + e.getMessage(),e);
         }
         try {
-            iCoreDemoCloud.testPut("testPut = " + test,"name");
+//            iCoreDemoCloud.testPut("testPut = " + test,"name");
         }catch (Exception e){
             LOGGER.error("XXXX --> testPut调用出错：" + e.getMessage(),e);
         }
         try {
-            iCoreDemoCloud.testDelete(new Pager(),"delete = " + test);
+//            iCoreDemoCloud.testDelete(new Pager(),"delete = " + test);
         }catch (Exception e){
             LOGGER.error("XXXX --> delete调用出错：" + e.getMessage(),e);
         }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java

@@ -70,7 +70,7 @@ public class AuthController extends CoreBaseController {
         }catch (AuthenticationException e) {
             return new ResultBean(false,e.getMessage());
         }catch (ImppBusiException e) {
-            return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution());
+            return ResultBean.fail(e);
         }catch (Exception e){
             return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java

@@ -58,7 +58,7 @@ public class SysConfigController extends CoreBaseController {
             sysConfigService.insertSysConfig(sysConfig);
             return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep.getErrorShow());
+            return ResultBean.fail(busExcep);
         }catch(Exception e){
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
@@ -71,7 +71,7 @@ public class SysConfigController extends CoreBaseController {
             sysConfigService.deleteSysConfigById(Long.parseLong(id));
             return  ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep.getErrorShow());
+            return ResultBean.fail(busExcep);
         }catch(Exception e){
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
@@ -97,7 +97,7 @@ public class SysConfigController extends CoreBaseController {
             sysConfigService.updateSysConfig(sysConfig);
             return  ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep.getErrorShow());
+            return ResultBean.fail(busExcep);
         }catch(Exception e){
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
@@ -112,7 +112,7 @@ public class SysConfigController extends CoreBaseController {
                                 .setResultList(sysConfigList)
                                 .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep.getErrorShow());
+            return ResultBean.fail(busExcep);
         }catch(Exception e){
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
@@ -130,7 +130,7 @@ public class SysConfigController extends CoreBaseController {
                 return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
             }
         }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep.getErrorShow());
+            return ResultBean.fail(busExcep);
         }catch(Exception e){
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
@@ -145,7 +145,7 @@ public class SysConfigController extends CoreBaseController {
                     .setListPager(sysConfigListPager)
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep.getErrorShow());
+            return ResultBean.fail(busExcep);
         }catch(Exception e){
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
@@ -162,7 +162,7 @@ public class SysConfigController extends CoreBaseController {
                 return  ResultBean.success("查询成功").setResultObject(sysConfig).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
             }
         }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep.getErrorShow());
+            return ResultBean.fail(busExcep);
         }catch(Exception e){
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
@@ -179,7 +179,7 @@ public class SysConfigController extends CoreBaseController {
                 return  ResultBean.success("查询成功").setResultList(sysConfig).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
             }
         }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep.getErrorShow());
+            return ResultBean.fail(busExcep);
         }catch(Exception e){
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
@@ -191,7 +191,7 @@ public class SysConfigController extends CoreBaseController {
 //            sysConfigService.update
             return null;
         }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep.getErrorShow());
+            return ResultBean.fail(busExcep);
         }catch(Exception e){
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
-import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
@@ -12,7 +11,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
 import cn.estsh.i3plus.pojo.platform.bean.SysFile;
-import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@@ -27,11 +25,20 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.core.io.Resource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.FileCopyUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLConnection;
 import java.util.List;
 
 /**
@@ -201,6 +208,8 @@ public class SysFileController extends CoreBaseController{
             sysFile.setFileOriginalName(file.getOriginalFilename());
             sysFile.setFileTypeId(dictionary.getId());
             sysFile.setFileTypeName(dictionary.getName());
+            sysFile.setUserId(getSessionUser().getUserId());
+            sysFile.setDownloadNum(0);
 
             SysFile fileDb = sysFileService.insertSysFile(sysFile);
 
@@ -213,4 +222,68 @@ public class SysFileController extends CoreBaseController{
             return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
+
+    @GetMapping("/download/{id}")
+    @ApiOperation(value = "文件下载",notes = "文件下载")
+    public ResultBean singleDownload(@PathVariable("id")String id, HttpServletResponse response) {
+        try {
+            ValidatorBean.checkIsNumber(id,"文件ID不能为空");
+
+            SysFile sysFile = sysFileService.getSysFileById(Long.parseLong(id));
+            if(sysFile == null){
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+                        .setErrorDetail("文件不存在")
+                        .build();
+            }
+
+            InputStream fis = dfsClient.downFile(sysFile.getDfsGroupName(), sysFile.getDfsFileName());
+
+            if(fis == null){
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+                        .setErrorDetail("文件已过期")
+                        .build();
+            }
+
+            response.setContentType("application/force-download");// 设置强制下载不打开
+            response.addHeader("Content-Disposition", "attachment;fileName=" + sysFile.getFileOriginalName());// 设置文件名
+            response.addHeader("Content-type", "application/octet-stream");// 设置文件名
+
+            BufferedInputStream bis = null;
+            try {
+                bis = new BufferedInputStream(fis);
+                OutputStream os = response.getOutputStream();
+                byte[] buffer = new byte[1024];
+                int i = bis.read(buffer);
+                while (i != -1) {
+                    os.write(buffer, 0, i);
+                    i = bis.read(buffer);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                if (bis != null) {
+                    try {
+                        bis.close();
+                        fis.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+
+            sysFile.setDownloadNum(sysFile.getDownloadNum() + 1);
+            return ResultBean.success("下载").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java

@@ -60,11 +60,11 @@ public class SysMessageController extends CoreBaseController {
             sysMessage.setMessageSenderId(getSessionUser().getUserId());
             sysMessage.setMessageSenderNameRdd(getSessionUser().getUserName());
             sysMessage.setMessageSendTime(sdf.format(new Date()));
-            sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_CONTENT_TYPE.HTML.getValue());
+            sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue());
 
             ConvertBean.modelInitialize(sysMessage,getSessionUser());
 
-            sysMessageService.sendSysMessage(sysMessage);
+            sysMessageService.doSendSysMessage(sysMessage);
             return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
+import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
@@ -8,11 +9,9 @@ import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
+import cn.estsh.i3plus.pojo.platform.bean.*;
-import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole;
-import cn.estsh.i3plus.pojo.platform.bean.SysUser;
-import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@@ -22,6 +21,7 @@ import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +49,9 @@ public class SysUserController extends CoreBaseController{
     @Autowired
     private ISysUserInfoService sysUserInfoService;
 
+    @Autowired
+    private ISysMessageService sysMessageService;
+
     @PostMapping(value = "/insert")
     @ApiOperation(value = "新增用户", notes = "新增系统用户")
     public ResultBean insertSysUser(SysUser sysUser,String[] roleIds) {
@@ -83,6 +86,8 @@ public class SysUserController extends CoreBaseController{
             sysUser.setUserStatus(CommonEnumUtil.USER_STATUS.NORMAL.getValue());
             sysUser.setDepartmentId(userInfo.getDepartmentId());
             sysUser.setDepartmentNameRdd(userInfo.getDepartmentNameRdd());
+            sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+            sysUser.setUserLoginNum(0);
             ConvertBean.modelInitialize(sysUser,AuthUtil.getSessionUser());
 
             SysUser user = sysUserService.insertSysUser(sysUser);
@@ -146,6 +151,7 @@ public class SysUserController extends CoreBaseController{
                 user.setUserLoginPassword(md5);
             }
 
+            user.setUserInfoId(userInfo.getId());
             user.setUserName(userInfo.getName());
             user.setDepartmentId(userInfo.getDepartmentId());
             user.setDepartmentNameRdd(userInfo.getDepartmentNameRdd());
@@ -272,9 +278,9 @@ public class SysUserController extends CoreBaseController{
         }
     }
 
-    @DeleteMapping(value = "/delete")
+    @DeleteMapping(value = "/delete/{id}")
-    @ApiOperation(value = "删除定时任务", notes = "删除定时任务")
+    @ApiOperation(value = "删除账号", notes = "删除制定账号信息")
-    public ResultBean delete(String id) {
+    public ResultBean delete(@PathVariable("id") String id) {
         try {
             // 数据校验
             ValidatorBean.checkNotNull(id, "用户id 不能为空");
@@ -333,4 +339,47 @@ public class SysUserController extends CoreBaseController{
         }
     }
 
+    @DeleteMapping("/reset-pwd/{id}")
+    @ApiOperation(value = "密码重置",notes = "根据id重置用户密码")
+    public ResultBean updateResetPassword(@PathVariable String id){
+        try {
+            SysUser user = sysUserService.getSysUserById(Long.parseLong(id));
+            if(user != null){
+                String password = RandomStringUtils.random(6, true, false);
+                user.setUserLoginPassword(EncryptTool.hexMD5(password));
+                sysUserService.updateSysUser(user);
+
+                String content = "系统提示：\n" +
+                        "\t"+getSessionUser().getUserName()+"使用密码重置功能帮您重置了【"+user.getUserLoginName()+"】账号的密码，" +
+                        "新密码是："+password+"";
+
+                SysMessage message = new SysMessage();
+                message.setMessageTitle("重置密码");
+                message.setMessageContent(content);
+                message.setMessageType(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue());
+                message.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.TEXT.getValue());
+                message.setMessageSenderId(getSessionUser().getUser().getId());
+                message.setMessageSenderNameRdd(getSessionUser().getUserName());
+                message.setMessageReceiversId(user.getId().toString());
+                message.setMessageReceiversNameRdd(user.getUserName());
+
+                sysMessageService.doSendSysMessage(message);
+
+                LOGGER.info("系统提示：{} 使用密码重置功能帮{}重置了{}账号的密码，新密码是：{}",
+                        getSessionUser().getUserName(),user.getUserName(),user.getUserLoginName(),password);
+                return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            }else{
+                return ResultBean.success("操作失败")
+                        .setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode())
+                        .setErrorMsg("用户不存在");
+            }
+        } catch (ImppBusiException busExcep) {
+            LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java

@@ -72,6 +72,7 @@ public class SysUserInfoController extends CoreBaseController{
                     .checkNotZero("positionId",userInfo.getPositionId());
 
             ConvertBean.modelInitialize(userInfo,user);
+            userInfo.setUserInfoStatus(CommonEnumUtil.USER_STATUS.NORMAL.getValue());
             SysUserInfo pos = sysUserInfoService.insertSysUserInfo(userInfo);
 
             sysUserInfoService.refreshRefUserDepartment(pos.getId(),

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java

@@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -41,7 +42,7 @@ public class MailQueueReceiver {
      * @param channel
      * @param message
      */
-    //@RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_MAIL_QUEUE)
+//    @RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_MAIL_QUEUE)
     public void processImppMail(SysMessage msg, Channel channel, Message message) {
         try {
             LOGGER.info("【MQ-IMPP_MESSAGE_MAIL_QUEUE】数据接收成功：{}",msg);
@@ -71,7 +72,7 @@ public class MailQueueReceiver {
 
                 // 发送邮件
                 mailUtil.setSubject(msg.getMessageTitle());
-                mailUtil.setContentType(ImppEnumUtil.MESSAGE_CONTENT_TYPE.valueOfDescription(msg.getMessageContentType()));
+                mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType()));
                 mailUtil.setBody(msg.getMessageContent());
                 mailUtil.setTo(sysUser.getUserEmail());
                 mailUtil.send();

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java

@@ -117,7 +117,7 @@ public class SysMessageService implements ISysMessageService {
     }
 
     @Override
-    public void sendSysMessage(SysMessage sysMessage) {
+    public void doSendSysMessage(SysMessage sysMessage) {
         // 判断消息类型推送到对应的队列
         if(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue() == sysMessage.getMessageType().intValue()){
             rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_MAIL_QUEUE,sysMessage);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java

@@ -327,7 +327,7 @@ public class SysUserService implements ISysUserService {
         if(userInfo == null){
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                    .setErrorCode(ImppExceptionEnum.LOGIN_EXCEPTION.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
                     .setErrorDetail("用户信息不存在")
                     .setErrorSolution("请联系管理员")
                     .build();

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java

@@ -202,7 +202,7 @@ public class MailUtil {
         MailUtil mail = new MailUtil();
         mail.setTo("yunhao.wang@estsh.com");
         mail.setSubject("中文");
-        mail.setContentType(ImppEnumUtil.MESSAGE_CONTENT_TYPE.HTML.getDescription());
+        mail.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getDescription());
         mail.setBody("内容");
         mail.send();
     }

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java

@@ -55,8 +55,6 @@ public class TestExcelPermission extends TestBase {
     @Autowired
     private SysRefRoleMenuRepository refRoleMenuRDao;
 
-
-
     @Test
     public void testInit() throws Exception {
         XSSFWorkbook workbook = getWorkbook(PATH_NAME);
@@ -87,9 +85,6 @@ public class TestExcelPermission extends TestBase {
         }
     }
 
-
-
-
     public List<SysRefUserRole> getRefUserRole(List<SysUser> users,List<SysRole> roles){
         List<SysRefUserRole> result = new ArrayList<>();
         if(users != null && roles != null){
@@ -175,6 +170,7 @@ public class TestExcelPermission extends TestBase {
                             obj.setUserEmpNo(row.getCell(2).getStringCellValue());
                             obj.setUserLoginNum(0);
                             obj.setIsValid(1);
+                            obj.setUserInfoStatus(1);
 
                             result.add(obj);
                         }
@@ -200,6 +196,8 @@ public class TestExcelPermission extends TestBase {
                             role.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
                             role.setName(row.getCell(1).getStringCellValue());
                             role.setRoleDescription(row.getCell(2).getStringCellValue());
+                            role.setRoleStatus(1);
+                            role.setIsValid(1);
 
                             result.add(role);
                         }

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java

@@ -21,7 +21,7 @@ public class TestMailUtil extends TestBase {
     public void TestSendMail(){
         mailUtil.setTo("yunhao.wang@estsh.com");
         mailUtil.setSubject("中文");
-        mailUtil.setContentType(ImppEnumUtil.MESSAGE_CONTENT_TYPE.HTML.getDescription());
+        mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getDescription());
         mailUtil.setBody("内容");
         mailUtil.send();