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 5bf0791..928536c 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 @@ -7,6 +7,7 @@ import java.util.List; import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.SerializerFeature; +import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; @@ -20,7 +21,7 @@ import com.tamguo.modules.sys.model.enums.SysUserTypeEnum; * */ @TableName(value="sys_user") -public class SysUserEntity implements Serializable { +public class SysUserEntity extends Model implements Serializable { private static final long serialVersionUID = 1L; @TableId @@ -477,5 +478,10 @@ public class SysUserEntity implements Serializable { this.userDataScopeListJson = userDataScopeListJson; } + @Override + protected Serializable pkVal() { + return getUserCode(); + } + } \ No newline at end of file diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java index abf47ee..ce9e474 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java @@ -52,4 +52,10 @@ public interface ISysUserService extends IService{ /** 删除用户*/ public Result delete(String userCode); + + /** 添加管理员*/ + public void saveAdmin(SysUserEntity user); + + /** 修改管理员*/ + public void updateAdmin(SysUserEntity user); } 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 4a4f07e..e07a5c5 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 @@ -243,4 +243,36 @@ public class SysUserServiceImpl extends ServiceImpl listData(SysUserCondition condition) { diff --git a/tamguo-oms/src/main/resources/templates/index.html b/tamguo-oms/src/main/resources/templates/index.html index 980e4b3..50dc181 100644 --- a/tamguo-oms/src/main/resources/templates/index.html +++ b/tamguo-oms/src/main/resources/templates/index.html @@ -10,7 +10,7 @@ -JeeSite Demo +Repas Demo diff --git a/tamguo-oms/src/main/resources/templates/login.html b/tamguo-oms/src/main/resources/templates/login.html index e41d853..3c53b79 100644 --- a/tamguo-oms/src/main/resources/templates/login.html +++ b/tamguo-oms/src/main/resources/templates/login.html @@ -4,13 +4,13 @@ - + - + -登录 - Tamguo OMS +登录 - Repas OMS @@ -30,7 +30,7 @@ @@ -118,7 +118,7 @@ - + \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/corpAdmin/add.html b/tamguo-oms/src/main/resources/templates/modules/sys/corpAdmin/add.html new file mode 100644 index 0000000..c9878ce --- /dev/null +++ b/tamguo-oms/src/main/resources/templates/modules/sys/corpAdmin/add.html @@ -0,0 +1,164 @@ + +系统管理员 - JeeSite Demo + + + + + + + + + + + + + +
+
+
+
+ 新增管理员 +
+
+ +
+
+ + + +
+
基本信息
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+   + +
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/corpAdmin/index.html b/tamguo-oms/src/main/resources/templates/modules/sys/corpAdmin/index.html index b9d4459..ad96ba6 100644 --- a/tamguo-oms/src/main/resources/templates/modules/sys/corpAdmin/index.html +++ b/tamguo-oms/src/main/resources/templates/modules/sys/corpAdmin/index.html @@ -25,7 +25,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
查询 - 新增管理员 + 新增管理员
@@ -104,18 +104,18 @@ $('#dataGrid').dataGrid({ }}, {header:'操作', name:'actions', width:250, sortable:false, title:false, formatter: function(val, obj, row, act){ var actions = []; - actions.push(' '); + actions.push(' '); if (row.status == Global.STATUS_NORMAL){ - actions.push(' '); + actions.push(' '); } if (row.status == Global.STATUS_DISABLE){ - actions.push(' '); + actions.push(' '); } - actions.push(' '); - actions.push(' '); + actions.push(' '); + actions.push(' '); actions.push(' '); actions.push('
'); - actions.push(' 重置密码 '); + actions.push(' 重置密码 '); actions.push('
'); return actions.join(''); }} diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/corpAdmin/update.html b/tamguo-oms/src/main/resources/templates/modules/sys/corpAdmin/update.html new file mode 100644 index 0000000..89c4ca3 --- /dev/null +++ b/tamguo-oms/src/main/resources/templates/modules/sys/corpAdmin/update.html @@ -0,0 +1,165 @@ + +系统管理员 - JeeSite Demo + + + + + + + + + + + + + +
+
+
+
+ 编辑管理员 +
+
+ +
+
+
+ + +
+
基本信息
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+   + +
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + \ No newline at end of file