bugfix

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -1,24 +1,16 @@
 package com.yonge.cooleshow.auth.web.controller;
 
-import com.yonge.cooleshow.common.constant.SysConfigConstant;
-import com.yonge.cooleshow.common.enums.SysUserType;
-import com.yonge.cooleshow.common.enums.UserLockFlag;
-import com.yonge.toolset.base.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 
 import javax.validation.Valid;
 
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
@@ -48,13 +40,17 @@ import com.yonge.cooleshow.auth.service.SysUserRoleService;
 import com.yonge.cooleshow.auth.service.SysUserService;
 import com.yonge.cooleshow.auth.web.controller.queryInfo.RoleQueryInfo;
 import com.yonge.cooleshow.common.constant.CommonConstants;
+import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.toolset.base.exception.BizException;
+import com.yonge.cooleshow.common.enums.SysUserType;
+import com.yonge.cooleshow.common.enums.UserStatusEnum;
 import com.yonge.cooleshow.common.security.AuthUser;
 import com.yonge.cooleshow.common.security.SecurityConstants;
 import com.yonge.cooleshow.common.security.SecurityUtils;
 import com.yonge.cooleshow.common.service.IdGeneratorService;
+import com.yonge.toolset.base.exception.BizException;
+import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.thirdparty.user.realname.RealnameAuthenticationPlugin;
 import com.yonge.toolset.utils.date.DateUtil;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
@@ -341,8 +337,8 @@ public class UserController extends BaseController {
     })
     @ApiOperation(value = "启用/冻结", notes = "传入lockFlag")
     public HttpResponseResult<Boolean> changeLock(@PathVariable("userId") Long userId
-            , @PathVariable("lockFlag") Integer lockFlag, @PathVariable("userType") SysUserType sysUserType) {
-        if (userId == null || lockFlag == null || sysUserType == null) {
+            , @PathVariable("userStatus") String userStatus, @PathVariable("userType") SysUserType sysUserType) {
+        if (userId == null || StringUtils.isBlank(userStatus) || sysUserType == null) {
             return failed("参数校验异常");
         }
         SysUser sysUser = sysUserService.queryUserInfo(userId);
@@ -352,13 +348,15 @@ public class UserController extends BaseController {
         if (sysUser.getId() != userId.longValue()) {
             return failed("非法操作");
         }
+        UserStatusEnum userStatusEnum = UserStatusEnum.codeOf(userStatus);
         //退出对应用户
-        if (UserLockFlag.LOCKED.getCode().equals(lockFlag)) {
+        if (UserStatusEnum.NORMAL != userStatusEnum) {
             loginOut(sysUser, sysUserType);
         }
         //sysUser.setLockFlag(lockFlag.getCode());
         //sysUser.setUpdateTime(new Date());
         //sysUserService.update(sysUser);
+        Integer lockFlag = userStatusEnum == UserStatusEnum.NORMAL ? 0 : 1;
         sysUserService.updateLockStatus(userId, lockFlag, sysUserType.getCode());
         return succeed();
     }

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/UserStatusEnum.java

@@ -27,4 +27,13 @@ public enum UserStatusEnum implements BaseEnum<String, UserStatusEnum> {
     public String getMsg() {
         return msg;
     }
+
+	public static UserStatusEnum codeOf(String code) {
+		for (UserStatusEnum userStatus : UserStatusEnum.values()) {
+			if (code.equals(userStatus.getCode())) {
+				return userStatus;
+			}
+		}
+		return null;
+	}
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -95,7 +95,7 @@
                 and u.gender_ = #{param.gender}
             </if>
             <if test="null != param.lockFlag">
-                and (u.lock_flag_ = #{param.lockFlag} or t.lock_flag_ = #{param.lockFlag})
+                and t.lock_flag_ = #{param.lockFlag}
             </if>
             <if test="param.startTime !=null">
                 <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -124,7 +124,7 @@
                 <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
             </if>
             <if test="null != param.lockFlag">
-                and (u.lock_flag_ = #{param.lockFlag} or t.lock_flag_ = #{param.lockFlag})
+                and t.lock_flag_ = #{param.lockFlag}
             </if>
             <if test="null != param.delFlag">
                 and u.del_flag_ = #{param.delFlag}

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -59,6 +59,8 @@
         , t.browse_ as "browse"
         , t.memo_ as "memo"
         , t.tag_ as "tag"
+        , t.degree_date_ as "degreeDate"
+        , t.teacher_date_ as "teacherDate"
         , t.create_time_ as "createTime"
         , t.update_time_ as "updateTime"
         </sql>
@@ -116,7 +118,7 @@
             	and find_in_set(#{param.tag},t.tag_)
             </if>
             <if test="null != param.lockFlag">
-                and (u.lock_flag_ = #{param.lockFlag} or t.lock_flag_ = #{param.lockFlag})
+                and t.lock_flag_ = #{param.lockFlag}
             </if>
             <if test="null != param.delFlag">
                 and u.del_flag_ = #{param.delFlag}

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherController.java

@@ -1,14 +1,26 @@
 package com.yonge.cooleshow.teacher.controller;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.TeacherDto;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
-import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
-import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
-import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.MyFens;
 import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
@@ -17,14 +29,7 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.base.page.QueryInfo;
 import com.yonge.toolset.base.util.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import com.yonge.toolset.mybatis.support.PageUtil;
 
 @RestController
 @RequestMapping("/teacher")