diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserController.java index 8b23ec2..3ba6013 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserController.java @@ -1,18 +1,22 @@ package com.ruoyi.web.controller.system.system; +import java.io.IOException; import java.util.List; import java.util.stream.Collectors; + +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.exception.file.InvalidExtensionException; +import com.ruoyi.common.utils.file.FileUploadUtils; +import com.ruoyi.common.utils.file.MimeTypeUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; @@ -43,6 +47,7 @@ import com.ruoyi.system.service.ISysUserService; @RequestMapping("/system/user") public class SysUserController extends BaseController { + private static final Logger log = LoggerFactory.getLogger(SysUserController.class); private String prefix = "system/user"; @Autowired @@ -127,8 +132,7 @@ public class SysUserController extends BaseController @Log(title = "用户管理", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(@Validated SysUser user) - { + public AjaxResult addSave(@Validated SysUser user) { if (!userService.checkLoginNameUnique(user)) { return error("新增用户'" + user.getLoginName() + "'失败，登录账号已存在"); diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html index 8bd9525..d8d80c0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html @@ -167,6 +167,32 @@ + +
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
@@ -188,6 +214,17 @@
+
+
+
+ +
+ + +
+
+
+
@@ -229,6 +266,8 @@ + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html index 70c2687..d0497ae 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html @@ -155,6 +155,30 @@
+
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index aedd1fc..af83512 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -218,6 +218,54 @@ public class SysUser extends BaseEntity @Excel(name = "审核人") private String examineuser; + /** 是否持有护照和港澳通行证 */ + @Excel(name = "是否持有护照和港澳通行证") + private String havePassport; + + /** 保密协议书 */ + @Excel(name = "保密协议书") + private String confAgreement; + + /** 保密协议书文件名 */ + @Excel(name = "保密协议书文件名") + private String confName; + + public String getConfName() { + return confName; + } + + public void setConfName(String confName) { + this.confName = confName; + } + + /** 是否出入境备案 */ + @Excel(name = "是否具有出入境备案") + private String entryexitFiling; + + public String getHavePassport() { + return havePassport; + } + + public void setHavePassport(String havePassport) { + this.havePassport = havePassport; + } + + public String getConfAgreement() { + return confAgreement; + } + + public void setConfAgreement(String confAgreement) { + this.confAgreement = confAgreement; + } + + public String getEntryexitFiling() { + return entryexitFiling; + } + + public void setEntryexitFiling(String entryexitFiling) { + this.entryexitFiling = entryexitFiling; + } + public String getExaminedate() { return examinedate; } @@ -580,6 +628,10 @@ public class SysUser extends BaseEntity ", examine='" + examine + '\'' + ", examinedate='" + examinedate + '\'' + ", examineuser='" + examineuser + '\'' + + ", havePassport='" + havePassport + '\'' + + ", confAgreement='" + confAgreement + '\'' + + ", entryexitFiling='" + entryexitFiling + '\'' + + ", confName='" + confName + '\'' + ", dept=" + dept + ", roles=" + roles + ", roleIds=" + Arrays.toString(roleIds) + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index ae4cb9d..af38ae7 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -38,6 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -64,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_time, u.remark,userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate, helthy,examine,examineuser,examinedate, + select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_time, u.remark,userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate, helthy,examine,examineuser,examinedate,have_passport,conf_agreement,entryexit_filing,conf_name, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from ${prefix}sys_user u @@ -74,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"