diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java index 0f7f958..b941691 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java @@ -5,10 +5,14 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; +import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import com.tamguo.modules.sys.model.enums.SysUserMgrTypeEnum; import com.tamguo.modules.sys.model.enums.SysUserStatusEnum; +import com.tamguo.modules.sys.model.enums.SysUserTypeEnum; /** @@ -36,7 +40,10 @@ public class SysUserEntity implements Serializable { private Date lastLoginDate; private String lastLoginIp; private String loginCode; - private String mgrType; + + @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) + private SysUserMgrTypeEnum mgrType; + private String mobile; private String mobileImei; private String password; @@ -60,12 +67,18 @@ public class SysUserEntity implements Serializable { private String remarks; private String sex; private String sign; + + @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) private SysUserStatusEnum status; + private String updateBy; private Date updateDate; private String userName; private String empName; - private String userType; + + @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) + private SysUserTypeEnum userType; + private BigDecimal userWeight; private String wxOpenid; private String userNameEn; @@ -358,14 +371,6 @@ public class SysUserEntity implements Serializable { this.userName = userName; } - public String getUserType() { - return this.userType; - } - - public void setUserType(String userType) { - this.userType = userType; - } - public BigDecimal getUserWeight() { return this.userWeight; } @@ -414,11 +419,11 @@ public class SysUserEntity implements Serializable { this.companyName = companyName; } - public String getMgrType() { + public SysUserMgrTypeEnum getMgrType() { return mgrType; } - public void setMgrType(String mgrType) { + public void setMgrType(SysUserMgrTypeEnum mgrType) { this.mgrType = mgrType; } @@ -454,5 +459,13 @@ public class SysUserEntity implements Serializable { this.userRoleString = userRoleString; } + public SysUserTypeEnum getUserType() { + return userType; + } + + public void setUserType(SysUserTypeEnum userType) { + this.userType = userType; + } + } \ No newline at end of file diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysUserMgrTypeEnum.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysUserMgrTypeEnum.java index 7a3ddef..017159f 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysUserMgrTypeEnum.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysUserMgrTypeEnum.java @@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.enums.IEnum; * 用户状态 */ public enum SysUserMgrTypeEnum implements IEnum { - NONEADMIN("0", "非系统管理员"), - SYSTEMADMIN("1", "系统管理员"), - SECADMIN("2" , "二级管理员"); + NONE_ADMIN("0", "非系统管理员"), + SYSTEM_ADMIN("1", "系统管理员"), + SEC_ADMIN("2" , "二级管理员"); private String value; private String desc; diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysUserStatusEnum.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysUserStatusEnum.java index 57c01b6..a997289 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysUserStatusEnum.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysUserStatusEnum.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.enums.IEnum; */ public enum SysUserStatusEnum implements IEnum { NORMAL("0", "正常"), - DELETE("1" , "禁用"), + DELETE("1" , "删除"), DISABLED("2" , "禁用"), LOCKED("3", "锁定"),; diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java index 5a3a5c3..98903f2 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java @@ -5,7 +5,6 @@ import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.crypto.hash.Sha256Hash; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -21,9 +20,12 @@ import com.tamguo.modules.sys.model.SysUserEntity; import com.tamguo.modules.sys.model.SysUserPostEntity; import com.tamguo.modules.sys.model.SysUserRoleEntity; import com.tamguo.modules.sys.model.condition.SysUserCondition; +import com.tamguo.modules.sys.model.enums.SysUserMgrTypeEnum; import com.tamguo.modules.sys.model.enums.SysUserStatusEnum; +import com.tamguo.modules.sys.model.enums.SysUserTypeEnum; import com.tamguo.modules.sys.service.ISysUserService; import com.tamguo.modules.sys.utils.ShiroUtils; +import com.tamguo.modules.sys.utils.TamguoConstant; @Service public class SysUserServiceImpl extends ServiceImpl implements ISysUserService{ @@ -114,9 +116,9 @@ public class SysUserServiceImpl extends ServiceImpl'+(val||row.id)+''; + return ''+(val||row.id)+''; }}, {header:'用户昵称', name:'userName', index:'u.user_name', width:200, align:"center"}, {header:'员工姓名', name:'refName', index:'u.ref_name', width:200, align:"center"}, @@ -306,7 +306,17 @@ $('#dataGrid').dataGrid({ {header:'办公电话', name:'phone', index:'u.phone', width:200, align:"center"}, {header:'更新时间', name:'updateDate', index:'u.update_date', width:200, align:"center"}, {header:'状态', name:'status', index:'u.status', width:140, align:"center", formatter: function(val, obj, row, act){ - return js.getDictLabel([{"id":"1019065439174938624","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":20,"treeSorts":"0000000020,","treeNames":"正常","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439174938624","dictLabelOrig":"正常","dictType":"sys_status","cssStyle":"","description":"","dictValue":"0","dictLabel":"正常","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439330127872","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":30,"treeSorts":"0000000030,","treeNames":"删除","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439330127872","dictLabelOrig":"删除","dictType":"sys_status","cssStyle":"color:#f00;","description":"","dictValue":"1","dictLabel":"删除","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439481122816","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":40,"treeSorts":"0000000040,","treeNames":"停用","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439481122816","dictLabelOrig":"停用","dictType":"sys_status","cssStyle":"color:#f00;","description":"","dictValue":"2","dictLabel":"停用","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439699226624","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":50,"treeSorts":"0000000050,","treeNames":"冻结","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439699226624","dictLabelOrig":"冻结","dictType":"sys_status","cssStyle":"color:#fa0;","description":"","dictValue":"3","dictLabel":"冻结","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439875387392","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":60,"treeSorts":"0000000060,","treeNames":"待审","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439875387392","dictLabelOrig":"待审","dictType":"sys_status","cssStyle":"","description":"","dictValue":"4","dictLabel":"待审","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065440022188032","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":70,"treeSorts":"0000000070,","treeNames":"驳回","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065440022188032","dictLabelOrig":"驳回","dictType":"sys_status","cssStyle":"","description":"","dictValue":"5","dictLabel":"驳回","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065440210931712","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":80,"treeSorts":"0000000080,","treeNames":"草稿","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065440210931712","dictLabelOrig":"草稿","dictType":"sys_status","cssStyle":"color:#aaa;","description":"","dictValue":"9","dictLabel":"草稿","parentCode":"0","isRoot":true,"isTreeLeaf":true}], val, '未知', true); + if(val == "0"){ + return "正常"; + }else if(val == "1"){ + return "删除"; + }else if(val == "2"){ + return "禁用"; + }else if(val == "3"){ + return "锁定"; + }else{ + return ""+val+""; + } }}, {header:'操作', name:'actions', width:260, sortable:false, title:false, formatter: function(val, obj, row, act){ var actions = [];