Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/mapper/TUserMapper.java

@@ -23,4 +23,5 @@ public interface TUserMapper extends BaseMapper<TUser> {
 
     TUser getById(String id);
 
+    List<TUser> getUserList(TUser user);
 }

src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java

@@ -158,10 +158,6 @@ public class TUser implements Serializable {
     @TableField(exist = false)
     private String statusName;
 
-    @ApiModelProperty("机构区分字段")
-    @TableField(exist = false)
-    private String oId;
-
 
     @TableField(exist = false)
     private String jwtToken;

src/main/java/cn/wisenergy/chnmuseum/party/service/TUserService.java

@@ -21,4 +21,6 @@ public interface TUserService extends IService<TUser> {
     Page<TUser> getList(Page<TUser> page, TUser user);
 
     TUser selectById(String id);
+
+    List<TUser> getUserList(TUser user);
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TUserServiceImpl.java

@@ -66,4 +66,10 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
         return user;
     }
 
+    @Override
+    public List<TUser> getUserList(TUser user) {
+        List<TUser> list = tUserMapper.getUserList(user);
+        return list;
+    }
+
 }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LoginController.java

@@ -165,13 +165,11 @@ public class LoginController {
                 }
                 List<Role> roles = roleService.selectRoleByUserId(user.getId());
                 List<String> list1 = new ArrayList<>();
+                //获取当前用户角色拥有菜单
+                List<Menu> userMenuPerms = new ArrayList<>();
                 if (roles!=null&&roles.get(0)!=null) {
                     roles.stream().forEach(r -> list1.add(r.getId()));
                     user.setRoleList(list1);
-                }
-                //获取当前用户角色拥有菜单
-                List<Menu> userMenuPerms = new ArrayList<>();
-                if (roles.size() > 0) {
                     userMenuPerms = this.menuService.getUserMenuPerms(list1);
                 }
 

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java

@@ -155,7 +155,8 @@ public class TOrganController extends BaseController {
         try {
             user = getcurUser();
             TOrgan tOrgan = new TOrgan();
-            tOrgan.setId(user.getOrgId());
+            //设置用户数据权限
+            tOrgan.setCode(user.getOrgCode());
             List<TOrgan> list = tOrganService.getAllList(tOrgan);
             return getResult(list);
         } catch (Exception e) {
@@ -179,7 +180,7 @@ public class TOrganController extends BaseController {
     @ApiOperation(value = "获取机构分页列表", notes = "获取机构分页列表")
     @MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
     public Map<String, Object> getTOrganPageList(GenericPageParam genericPageParam) {
-
+        TUser user = getcurUser();
         Page<TOrgan> page = null;
         try {
             LambdaQueryWrapper<TOrgan> queryWrapper = new LambdaQueryWrapper<>();
@@ -192,6 +193,8 @@ public class TOrganController extends BaseController {
                 queryWrapper.ge(TOrgan::getCreateTime, genericPageParam.getStartDate().atTime(0, 0, 0))
                         .le(TOrgan::getCreateTime, genericPageParam.getEndDate().atTime(23, 59, 59));
             }
+            //设置用户数据权限
+            queryWrapper.likeRight(TOrgan::getCode,user.getOrgCode());
             // 设置排序规则
             queryWrapper.orderByDesc(TOrgan::getCreateTime);
             page = this.tOrganService.page(getPage(), queryWrapper);
@@ -223,13 +226,14 @@ public class TOrganController extends BaseController {
 	@ApiOperation(value = "获取机构树", notes = "获取机构树")
 //    @MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
 	public Map<String, Object> getTree(String name) {
+        TUser user = getcurUser();
         List<TOrgan> list = new ArrayList<>();
 
         try {
             if (StringUtils.isBlank(name)) {
                 list = tOrganService.getTree();
             }else {
-                list = tOrganService.list(new UpdateWrapper<TOrgan>().like("name",name));
+                list = tOrganService.list(new UpdateWrapper<TOrgan>().like("name",name).likeRight("code",user.getOrgCode()));
             }
             return getResult(list);
         } catch (Exception e) {

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java

@@ -89,6 +89,17 @@ public class TUserController extends BaseController {
         }
         if (StringUtils.isNotBlank(type)) {
             user.setType(type);
+            if (!"4".equals(type) && !"5".equals(type)) {
+                //设置用户数据权限
+                user.setOrgCode(user1.getOrgCode());
+            }
+            if ("2".equals(type)) {
+                List<String> roleList = user1.getRoleList();
+                //如果是单位用户，只能查看本机构的单位用户
+                if (roleList != null && !roleList.contains("1") && roleList.contains("2")) {
+                    user.setOrgId(user1.getOrgId());
+                }
+            }
         }
         if (StringUtils.isNotBlank(orgId)) {
             user.setOrgId(orgId);
@@ -103,11 +114,7 @@ public class TUserController extends BaseController {
                 user.setAuditStatus(status);
             }
         }
-        List<String> roleList = user1.getRoleList();
-        if (roleList != null && !roleList.contains("1") && roleList.contains("2")) {
-            user.setOId(user1.getOrgId());
-            user.setType("2");
-        }
+
         try {
             Page<TUser> list = userService.getList(getPage(), user);
             return getResult(list);
@@ -122,20 +129,27 @@ public class TUserController extends BaseController {
     @RequiresPermissions("/user/getUserList")
 //    @MethodLog(operModule = OperModule.USER, operType = OperType.SELECT)
     public Map<String, Object> getUserList(String type, String status, String auditStatus) {
-        UpdateWrapper<TUser> wrapper = new UpdateWrapper<>();
+        TUser user1 = getcurUser();
+        TUser user = new TUser();
         try {
             if (StringUtils.isNotBlank(type)) {
-                wrapper.eq("type", type);
-            }
-            if (StringUtils.isNotBlank(status)) {
-                wrapper.eq("status", status);
+               user.setType(type);
+                if (!"4".equals(type) && !"5".equals(type)) {
+                    //设置用户数据权限
+                   user.setOrgCode(user1.getOrgCode());
+                }
             }
             if (StringUtils.isNotBlank(auditStatus)) {
-                wrapper.eq("audit_status", auditStatus);
+                user.setAuditStatus(auditStatus);
+            }
+            if (StringUtils.isNotBlank(status)) {
+                if ("1".equals(status) || "2".equals(status)) {
+                    user.setStatus(status);
+                } else {
+                    user.setAuditStatus(status);
+                }
             }
-            wrapper.eq("is_deleted", false);
-            wrapper.orderByDesc("create_time");
-            List<TUser> list = userService.list(wrapper);
+            List<TUser> list = userService.getUserList(user);
             return getResult(list);
         } catch (Exception e) {
             logger.error("查询成员列表出错!", e);
@@ -496,6 +510,7 @@ public class TUserController extends BaseController {
                 user.setPasswordSalt(salt);
                 user.setPasswordHash((SHA256PasswordEncryptionService.createPasswordHash(password, salt)));
                 user.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
+                user.setPassword(password);
                 ret = this.userService.updateById(user);
             } else {
                 logger.error("旧密码不正确");
@@ -536,6 +551,7 @@ public class TUserController extends BaseController {
             byte[] passwordHash = SHA256PasswordEncryptionService.createPasswordHash(newPassword, passwordSalt);
             user.setPasswordSalt(passwordSalt);
             user.setPasswordHash(passwordHash);
+            user.setPassword(newPassword);
             user.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
             boolean ret = userService.updateById(user);
             if (!ret) {
@@ -583,6 +599,19 @@ public class TUserController extends BaseController {
                 }
             }
 
+            if (StringUtils.isNoneBlank(user.getOrgId())) {
+                user.setOrgId(user.getOrgId());
+                ew.eq("is_deleted", 0);
+                ew.eq("type", "3");
+                ew.eq("org_id", user.getOrgId());
+                List<TUser> list = this.userService.list(ew);
+                if (list != null&&list.size()>1&&list.get(0)!=null) {
+                    resultMap.put("resultCode", 200);
+                    resultMap.put("message", "每个单位只能有一个机顶盒账号！");
+                    return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                }
+            }
+
             byte[] passwordSalt = SecureRandomSaltService.generateSalt();
             byte[] passwordHash = SHA256PasswordEncryptionService
                     .createPasswordHash(user.getPassword(), passwordSalt);

src/main/resources/mapper/TOrganMapper.xml

@@ -43,8 +43,8 @@ from t_organ o
 left join t_organ r on o.parent_id = r.id
 left join t_area a on o.area_id = a.id
 where 1=1
-        <if test=" org.id != null and org.id != '' ">
-            and o.id LIKE concat('%', #{org.id})
+        <if test=" org.code != null and org.code != '' ">
+            and o.code LIKE concat(#{org.code},'%')
         </if>
         order by o.create_time desc
     </select>

src/main/resources/mapper/TUserMapper.xml

@@ -81,8 +81,40 @@
         <if test=" user.orgId != null and user.orgId != '' ">
             and u.org_id = #{user.orgId}
         </if>
-        <if test=" user.OId != null and user.OId != '' ">
-            and u.org_id = #{user.OId}
+        <if test=" user.orgCode != null and user.orgCode != '' ">
+            and o.code LIKE concat(#{user.orgCode}, '%')
+        </if>
+        <if test=" user.areaId != null and user.areaId != '' ">
+            and u.area_id = #{user.areaId}
+        </if>
+        and u.is_deleted = false
+        order by u.create_time desc
+    </select>
+
+
+    <select id="getUserList" resultMap="BaseResultMap">
+        select u.*,o.name org_name,a.full_name area_name
+        from t_user u
+        left join t_organ o on o.id = u.org_id
+        left join t_area a on u.area_id = a.id
+        where 1 = 1
+        <if test=" user.userName != null and user.userName != '' ">
+            and u.user_name LIKE concat('%', #{user.userName}, '%')
+        </if>
+        <if test=" user.status != null and user.status != '' ">
+            and u.status = #{user.status}
+        </if>
+        <if test=" user.auditStatus != null and user.auditStatus != '' ">
+            and (u.audit_status = "1" or u.audit_status = "3")
+        </if>
+        <if test=" user.type != null and user.type != '' ">
+            and u.type = #{user.type}
+        </if>
+        <if test=" user.orgId != null and user.orgId != '' ">
+            and u.org_id = #{user.orgId}
+        </if>
+        <if test=" user.orgCode != null and user.orgCode != '' ">
+            and o.code LIKE concat(#{user.orgCode}, '%')
         </if>
         <if test=" user.areaId != null and user.areaId != '' ">
             and u.area_id = #{user.areaId}