修改登录

用户列表
全局配置
用户修改
同步用户表结构

server/like-common/src/main/java/com/mdd/common/cache/ConfigCache.java

@@ -79,9 +79,11 @@ public class ConfigCache {
         Map<String, Object> cacheConfig = getConfigCache();
         if (!cacheConfig.isEmpty()) {
             Object cacheConfigObj = cacheConfig.get(type);
-            Map<String, String> cacheConfigMap = MapUtils.jsonToMap(cacheConfigObj.toString());
-            if (!cacheConfigMap.isEmpty()) {
-                return cacheConfigMap;
+            if (cacheConfigObj != null) {
+                Map<String, String> cacheConfigMap = MapUtils.jsonToMap(cacheConfigObj.toString());
+                if (!cacheConfigMap.isEmpty()) {
+                    return cacheConfigMap;
+                }
             }
         }
         return new LinkedHashMap<>();

server/like-common/src/main/java/com/mdd/common/entity/OfficialAccountReply.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
 
 @Data
 @ApiModel("公众号回复实体")
-public class OfficialReply implements Serializable {
+public class OfficialAccountReply implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -42,9 +42,6 @@ public class OfficialReply implements Serializable {
     @ApiModelProperty("排序编号")
     private Integer sort;
 
-    @ApiModelProperty("是否删除")
-    private Integer isDelete;
-
     @ApiModelProperty("创建时间")
     private Long createTime;
 

server/like-common/src/main/java/com/mdd/common/entity/admin/Jobs.java

@@ -0,0 +1,45 @@
+package com.mdd.common.entity.system;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel("系统岗位管理")
+public class Jobs implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value="id", type= IdType.AUTO)
+    @ApiModelProperty("ID")
+    private Integer id;
+
+    @ApiModelProperty("岗位编码")
+    private String code;
+
+    @ApiModelProperty("岗位名称")
+    private String name;
+
+    @ApiModelProperty("岗位备注")
+    private String remark;
+
+    @ApiModelProperty("岗位排序")
+    private Integer sort;
+
+    @ApiModelProperty("是否停用: [0=否, 1=是]")
+    private Integer status;
+
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    @ApiModelProperty("删除时间")
+    private Long deleteTime;
+
+}

server/like-common/src/main/java/com/mdd/common/mapper/OfficialAccountReplyMapper.java

@@ -1,12 +1,12 @@
 package com.mdd.common.mapper;
 
 import com.mdd.common.core.basics.IBaseMapper;
-import com.mdd.common.entity.OfficialReply;
+import com.mdd.common.entity.OfficialAccountReply;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 公众号回复Mapper
  */
 @Mapper
-public interface OfficialReplyMapper extends IBaseMapper<OfficialReply> {
+public interface OfficialAccountReplyMapper extends IBaseMapper<OfficialAccountReply> {
 }

server/like-common/src/main/java/com/mdd/common/mapper/admin/AdminMapper.java

@@ -18,5 +18,8 @@ public interface AdminMapper extends IBaseMapper<Admin> {
     @Select("SELECT * FROM la_admin admin INNER JOIN la_admin_dept lad ON admin.id = lad.admin_id WHERE lad.dept_id = #{deptId} AND admin.delete_time IS NULL")
     List<Admin> getByDept(@Param("deptId") Integer deptId);
 
+    @Select("SELECT * FROM la_admin admin INNER JOIN la_admin_jobs lad ON admin.id = lad.admin_id WHERE lad.jobs_id = #{jobId} AND admin.delete_time IS NULL")
+    List<Admin> getByJobs(@Param("jobId") Integer jobId);
+
 
 }

server/like-common/src/main/java/com/mdd/common/mapper/admin/JobsMapper.java

@@ -0,0 +1,14 @@
+package com.mdd.common.mapper.admin;
+
+import com.mdd.common.core.basics.IBaseMapper;
+import com.mdd.common.entity.admin.Dept;
+import com.mdd.common.entity.system.Jobs;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 岗位表Mapper
+ */
+@Mapper
+public interface JobsMapper extends IBaseMapper<Jobs> {
+
+}