用户增加数据权限

user_center/src/main/java/com/huaxu/dao/UserMapper.java

@@ -23,7 +23,7 @@ public interface UserMapper extends BaseMapper<UserEntity> {
      * @param  page 
      * @param  userEntity 实体类
      */
-     Page<UserEntity> findPage(IPage<UserEntity> page, @Param("user") UserEntity userEntity, @Param("userType") String userType,@Param("list") Long[] list);
+     Page<UserEntity> findPage(IPage<UserEntity> page, @Param("user") UserEntity userEntity);
 
      UserEntity findUserById(Serializable id);
 

user_center/src/main/java/com/huaxu/entity/UserEntity.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.huaxu.model.ProgramItem;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -116,4 +117,8 @@ public class UserEntity implements Serializable {
     @ApiModelProperty(value = "用户组")
     @TableField(exist = false)
     private Long userGroupId;
+
+    @ApiModelProperty(value ="权限",hidden = true)
+    @TableField(exist = false)
+    private List<ProgramItem> programItems;
 }

user_center/src/main/java/com/huaxu/service/UserService.java

@@ -41,19 +41,10 @@ public class UserService extends ServiceImpl<UserMapper,UserEntity> {
 	 */
 	public IPage<UserEntity> findPage(IPage<UserEntity> page, UserEntity userEntity) {
 		LoginUser currentUser = UserUtil.getCurrentUser();
-		List<ProgramItem> programItems = new ArrayList<ProgramItem>();
-		Long[] ids = null;
-		if (currentUser != null) {
-			userEntity.setTenantId(currentUser.getTenantId());
-			programItems = currentUser.getProgramItemList();
-			if (programItems != null && programItems.size() > 0) {
-				ids = new Long[programItems.size()];
-				for (int i = 0; i < programItems.size(); i++) {
-					ids[i] = Long.valueOf(programItems.get(i).getOrgId());
-				}
-			}
-		}
-		Page<UserEntity> userPage = userMapper.findPage(page, userEntity, currentUser.getType(), ids);
+		userEntity.setTenantId(currentUser.getTenantId());
+		userEntity.setProgramItems(currentUser.getProgramItemList());
+		userEntity.setUserType(currentUser.getType());
+		Page<UserEntity> userPage = userMapper.findPage(page, userEntity);
 		return userPage;
 	}
 

user_center/src/main/resources/mapper/UserMapper.xml

@@ -97,15 +97,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      or a.COMPANY_ORG_ID = #{user.companyOrgId}
                   )
             </if>
-           <if test="userType != null  and userType != '' and '2'.toString() == userType.toString() and list != null">
+            <if test="user.userType!=null and user.userType!=-999 and user.userType!=-9999 and  user.programItems != null and user.programItems.size() > 0">
                 and ( a.DEPT_ORG_ID in
-                       <foreach collection="list" item="item" open="(" close=")" separator=",">
-                           #{item}
+                       <foreach collection="user.programItems" item="item" open="(" close=")" separator=",">
+                           #{item.orgId}
                        </foreach>
                        or
                      a.COMPANY_ORG_ID in
-                        <foreach collection="list" item="item" open="(" close=")" separator=",">
-                            #{item}
+                        <foreach collection="user.programItems" item="item" open="(" close=")" separator=",">
+                            #{item.orgId}
                         </foreach>
                 )
            </if>