fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -46,11 +46,11 @@ public class UserController extends BaseController {
      * 查询客户端用户列表
      */
     @ApiOperation("查询客户端用户列表")
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @PreAuthorize("@ss.hasPermi('app:user:list')")
     @GetMapping("/list")
     public TableDataInfo<UserVo> list(UserQueryBo bo) {
         startPage();
-        List<UserVo> list = iUserService.queryList(bo);
+        List<UserVo> list = iUserService.selectList(bo);
         return getDataTable(list);
     }
 
@@ -58,7 +58,7 @@ public class UserController extends BaseController {
      * 导出客户端用户列表
      */
     @ApiOperation("导出客户端用户列表")
-    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    @PreAuthorize("@ss.hasPermi('app:user:export')")
     @Log(title = "客户端用户", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<UserVo> export(UserQueryBo bo) {
@@ -71,7 +71,7 @@ public class UserController extends BaseController {
      * 获取客户端用户详细信息
      */
     @ApiOperation("获取客户端用户详细信息")
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @PreAuthorize("@ss.hasPermi('app:user:query')")
     @GetMapping("/{userId}")
     public AjaxResult<UserVo> getInfo(@PathVariable("userId" ) Long userId) {
         return AjaxResult.success(iUserService.queryById(userId));
@@ -81,7 +81,7 @@ public class UserController extends BaseController {
      * 新增客户端用户
      */
     @ApiOperation("新增客户端用户")
-    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @PreAuthorize("@ss.hasPermi('app:user:add')")
     @Log(title = "客户端用户", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody UserAddBo bo) {
@@ -92,7 +92,7 @@ public class UserController extends BaseController {
      * 修改客户端用户
      */
     @ApiOperation("修改客户端用户")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @PreAuthorize("@ss.hasPermi('app:user:edit')")
     @Log(title = "客户端用户", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody UserEditBo bo) throws IllegalAccessException {
@@ -103,7 +103,7 @@ public class UserController extends BaseController {
      * 删除客户端用户
      */
     @ApiOperation("删除客户端用户")
-    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    @PreAuthorize("@ss.hasPermi('app:user:remove')")
     @Log(title = "客户端用户" , businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public AjaxResult<Void> remove(@PathVariable Long[] userIds) {

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -80,6 +80,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Autowired
     private IActivityGradeService activityGradeService;
 
+    @Autowired
+    private UserMapper userMapper;
+
 
     @Override
     public UserVo queryById(Long userId) {
@@ -137,6 +140,22 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<UserVo> selectList(UserQueryBo bo) {
+        List<User> list = userMapper.selectList(bo);
+        return entity2Vo(list);
+    }
+
+    private List<UserVo> entity2Vo(List<User> list) {
+        List<UserVo> newList = new ArrayList<>();
+        for(int i=0;i<list.size();i++){
+            UserVo vo = BeanUtil.toBean(list.get(i), UserVo.class);
+            vo.setNull(); //清除关键数据
+            newList.add(vo);
+        }
+        return newList;
+    }
+
     /**
      * 实体类转化成视图对象
      *

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SchoolQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -44,7 +45,7 @@ public class SchoolQueryBo extends BaseEntity {
 	private String schoolName;
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
-	private Integer status;
+	private List<Integer> status;
 	/** 简介 */
 	@ApiModelProperty("简介")
 	private String introduction;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -146,4 +146,12 @@ private static final long serialVersionUID=1L;
 
     /** 公众号openid */
     private String gzhOpenId;
+
+    /** 课程数 */
+    @TableField(exist = false)
+    private Long courseNum;
+
+    /** 学习时长 */
+    @TableField(exist = false)
+    private Long studyTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserMapper.java

@@ -1,9 +1,11 @@
 package com.zhongzheng.modules.user.mapper;
 
 import com.zhongzheng.modules.user.bo.RanKingUserQuery;
+import com.zhongzheng.modules.user.bo.UserQueryBo;
 import com.zhongzheng.modules.user.domain.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.user.vo.RanKingUser;
+import com.zhongzheng.modules.user.vo.UserVo;
 
 import java.util.List;
 
@@ -24,4 +26,6 @@ public interface UserMapper extends BaseMapper<User> {
     RanKingUser selectByOneRank(RanKingUserQuery query);
 
     Integer selectUserNum(Integer grade);
+
+    List<User> selectList(UserQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserService.java

@@ -35,6 +35,8 @@ public interface IUserService extends IService<User> {
 	 */
 	List<UserVo> queryList(UserQueryBo bo);
 
+	List<UserVo> selectList(UserQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入用户
 	 * @param bo 用户新增业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/SchoolServiceImpl.java

@@ -46,7 +46,7 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
         LambdaQueryWrapper<School> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getSchoolTypeId() != null, School::getSchoolTypeId, bo.getSchoolTypeId());
         lqw.like(StrUtil.isNotBlank(bo.getSchoolName()), School::getSchoolName, bo.getSchoolName());
-        lqw.eq(bo.getStatus() != null, School::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, School::getStatus, bo.getStatus());
         lqw.eq(StrUtil.isNotBlank(bo.getIntroduction()), School::getIntroduction, bo.getIntroduction());
         lqw.eq(StrUtil.isNotBlank(bo.getSchoolCity()), School::getSchoolCity, bo.getSchoolCity());
         lqw.eq(StrUtil.isNotBlank(bo.getAdvantageSpecialty()), School::getAdvantageSpecialty, bo.getAdvantageSpecialty());

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -159,6 +159,14 @@ public class UserVo {
 	@Excel(name = "公众号openid")
 	@ApiModelProperty("公众号openid")
 	private String gzhOpenId;
+	/** 课程数 */
+	@Excel(name = "课程数")
+	@ApiModelProperty("课程数")
+	private Long courseNum;
+	/** 学习时长 */
+	@Excel(name = "学习时长")
+	@ApiModelProperty("学习时长")
+	private Long studyTime;
 
 	public void setNull(){
 		this.setOpenId(null);

zhongzheng-system/src/main/resources/mapper/modules/user/SchoolMapper.xml

@@ -30,8 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN sys_dict_data dd ON s.dict_code = dd.dict_code
         WHERE
         1 = 1
-        <if test="status != null and status != ''" >
-            AND s.status = #{status}
+        <if test="status != null and status.size()!=0 ">
+            AND s.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         <if test="schoolName != null and schoolName != ''" >
             AND s.school_name like concat('%', #{schoolName}, '%')

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -45,6 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="email" column="email"/>
         <result property="avatar" column="avatar"/>
         <result property="inviteUserAccount" column="invite_user_account"/>
+        <result property="courseNum" column="course_num"/>
+        <result property="studyTime" column="study_time"/>
     </resultMap>
 
 
@@ -108,4 +110,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE 1=1 and user_level = #{grade}
     </select>
 
+    <select id="selectList" resultMap="UserResult">
+        SELECT
+        u.*,
+        IFNULL( temp.num, 0 ) course_num,
+        IFNULL( temp1.study_time, 0 ) study_time
+        FROM
+        `user` u
+        LEFT JOIN ( SELECT opu.user_id, COUNT(*) num FROM order_possess_user opu WHERE opu.type_id = 1 GROUP BY opu.user_id ) temp ON u.user_id = temp.user_id
+        LEFT JOIN ( SELECT usr.user_id, sum( usr.study_duration ) study_time FROM user_study_record usr GROUP BY usr.user_id ) temp1 ON u.user_id = temp1.user_id
+        WHERE
+        1 = 1
+        <if test="status != null and status.size()!=0 ">
+            AND u.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="nickname != null and nickname != ''" >
+            AND u.nickname like concat('%', #{nickname}, '%')
+        </if>
+        <if test="telphone != null and telphone != ''" >
+            AND u.telphone = #{telphone}
+        </if>
+        <if test="idCard != null and idCard != ''" >
+            AND u.id_card = #{idCard}
+        </if>
+    </select>
+
 </mapper>