修改登录

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

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

@@ -0,0 +1,48 @@
+package com.mdd.common.entity.admin;
+
+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 Dept implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value="id", type= IdType.AUTO)
+    @ApiModelProperty("ID")
+    private Integer id;
+
+    @ApiModelProperty("上级部门")
+    private Integer pid;
+
+    @ApiModelProperty("部门名称")
+    private String name;
+
+    @ApiModelProperty("负责人名")
+    private String leader;
+
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @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/entity/decorate/DecorateTabbar.java

@@ -30,6 +30,9 @@ public class DecorateTabbar implements Serializable {
     @ApiModelProperty("链接地址")
     private String link;
 
+    @ApiModelProperty("是否显示")
+    private Integer isShow;
+
     @ApiModelProperty("创建时间")
     private Long createTime;
 

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

@@ -19,13 +19,13 @@ public class NoticeSetting implements Serializable {
     private Integer id;
 
     @ApiModelProperty("场景编号")
-    private Integer scene;
+    private Integer sceneId;
 
     @ApiModelProperty("场景名称")
-    private String name;
+    private String sceneName;
 
     @ApiModelProperty("场景描述")
-    private String remarks;
+    private String sceneDesc;
 
     @ApiModelProperty("接收人员: [1=用户, 2=平台]")
     private Integer recipient;
@@ -45,16 +45,7 @@ public class NoticeSetting implements Serializable {
     @ApiModelProperty("小程序通知设置")
     private String mnpNotice;
 
-    @ApiModelProperty("是否删除: [0=否, 1=是]")
-    private Integer isDelete;
-
-    @ApiModelProperty("创建时间")
-    private Long createTime;
-
     @ApiModelProperty("更新时间")
     private Long updateTime;
 
-    @ApiModelProperty("删除时间")
-    private Long deleteTime;
-
 }

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

@@ -3,6 +3,7 @@ package com.mdd.common.mapper.admin;
 import com.mdd.common.core.basics.IBaseMapper;
 import com.mdd.common.entity.admin.Admin;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -13,4 +14,9 @@ import java.util.List;
 @Mapper
 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);
+
+
 }

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

@@ -0,0 +1,13 @@
+package com.mdd.common.mapper.admin;
+
+import com.mdd.common.core.basics.IBaseMapper;
+import com.mdd.common.entity.admin.Dept;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 部门表Mapper
+ */
+@Mapper
+public interface DeptMapper extends IBaseMapper<Dept> {
+
+}

server/like-common/src/main/java/com/mdd/common/plugin/notice/NoticeDriver.java

@@ -20,8 +20,7 @@ public class NoticeDriver {
         NoticeSettingMapper noticeSettingMapper = SpringUtils.getBean(NoticeSettingMapper.class);
         NoticeSetting noticeSetting = noticeSettingMapper.selectOne(
                 new QueryWrapper<NoticeSetting>()
-                        .eq("scene", noticeSmsVo.getScene())
-                        .eq("is_delete", 0)
+                        .eq("scene_id", noticeSmsVo.getScene())
                         .last("limit 1"));
 
         if (StringUtils.isNull(noticeSetting)) {
@@ -30,7 +29,7 @@ public class NoticeDriver {
 
         // 短信通知
         SmsTemplate smsTemplate = new SmsTemplate();
-        smsTemplate.setName(noticeSetting.getName());
+        smsTemplate.setName(noticeSetting.getSceneName());
         smsTemplate.setType(noticeSetting.getType());
         smsTemplate.setParams(noticeSetting.getSmsNotice());
         if (StringUtils.isNotNull(smsTemplate.getStatus()) && smsTemplate.getStatus().equals(1)) {