求职用户useFlag状态相关修改

happy-job-base-system/src/main/webapp/webpage/modules/sys/hpuser/hpUserList.js

@@ -191,7 +191,7 @@ $(document).ready(function() {
                          approve(row.id);
                        },
                     'click .again': function (e, value, row, index) {
-                        again(row.id);
+                        again(row.id,row.hpUser.useFlag);
                     },
                     'click .qrcode': function (e, value, row, index) {
                         qrcode(row.qrCode);
@@ -201,7 +201,7 @@ $(document).ready(function() {
                 	var val = row.hpUser.useFlag;
                 	// var a = '<a href="#" class="view">【查看】</a>';
                 	var b = '<a href="#" class="approve">【认证】</a>';
-                	var c = val? '<a href="#" class="again">【解锁】</a>':'<a href="#" class="del">【锁定】</a>';
+                	var c = val==1? '<a href="#" class="again">【解锁】</a>':val==2?'<a href="#" class="again">【解除注销】</a>':'<a href="#" class="del">【锁定】</a>';
                 	// var d = '<a href="#" class="qrcode">【二维码】</a>';
                             return [
                                 // <shiro:hasPermission name="sys:hpMember:view">
@@ -358,8 +358,12 @@ $(document).ready(function() {
 		})
   	}
 
-	function again(id){
-		jp.confirm('是否对该用户解锁？', function(){
+	function again(id,useFlag){
+  		var message="是否对该用户解锁？";
+  		if(useFlag==2){
+  			message="是否对该用户解除注销？"
+		}
+		jp.confirm(message, function(){
 			jp.loading();
 			jp.get("${ctx}/sys/hpMember/again?id=" + id, function(data){
 				if(data.success){

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/sys/aspect/LoginAppAspect.java

@@ -81,7 +81,7 @@ public class LoginAppAspect extends BaseAppController {
             }
 
             if (StringUtils.isNotBlank(hpUser.getId())) {
-                if (hpUser.getUseFlag()) {
+                if (hpUser.getUseFlag()==1 || hpUser.getUseFlag()==2) {
                     returnMap.put("success", "4000");
                 } else {
                     //执行业务操作

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/sys/aspect/LoginWxAppletsAspect.java

@@ -85,7 +85,7 @@ public class LoginWxAppletsAspect extends BaseAppController {
                 }
             }
             if (StringUtils.isNotBlank(hpUser.getId())) {
-                if (hpUser.getUseFlag()) {
+                if (hpUser.getUseFlag()==1 || hpUser.getUseFlag()==2) {
                     returnMap.put("success", "4000");
                 } else {
                     //执行业务操作

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/sys/entity/HpUser.java

@@ -54,7 +54,7 @@ public class HpUser extends DataEntity<HpUser> {
     private String qrCode;    //用户二维码
     private Date beginCreateDate;        // 开始 创建时间
     private Date endCreateDate;        // 结束 创建时间
-    private Boolean useFlag;    //禁用
+    private Integer useFlag;    //用户状态（0: 正常 1：已锁定 2：已注销）
     private String idCardFront;        // 身份证正面
     private String idCardBack;        // 身份证反面
     private String idCardHold;        // 手持身份证
@@ -343,11 +343,11 @@ public class HpUser extends DataEntity<HpUser> {
         this.endCreateDate = endCreateDate;
     }
 
-    public Boolean getUseFlag() {
+    public Integer getUseFlag() {
         return useFlag;
     }
 
-    public void setUseFlag(Boolean useFlag) {
+    public void setUseFlag(Integer useFlag) {
         this.useFlag = useFlag;
     }
 

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/sys/service/HpUserService.java

@@ -266,7 +266,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
             hpUser.setContactStatus(0);
             hpUser.setUserType("0");
             hpUser.setClientId(clientId);
-            hpUser.setUseFlag(false);
+            hpUser.setUseFlag(0);
             this.save(hpUser);
             hpUser1 = this.get(hpUser.getId());
             //用户token作为请求的标准
@@ -513,7 +513,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                         hpUser1.setAuthenticationStatus(0);
                         hpUser1.setContactStatus(0);
                         hpUser1.setUserType("0");
-                        hpUser1.setUseFlag(false);
+                        hpUser1.setUseFlag(0);
                         this.save(hpUser1);
                         hpUser = this.get(hpUser1.getId());
                         //用户token作为请求的标准
@@ -533,7 +533,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                     hpUser1.setAuthenticationStatus(0);
                     hpUser1.setContactStatus(0);
                     hpUser1.setUserType("0");
-                    hpUser1.setUseFlag(false);
+                    hpUser1.setUseFlag(0);
                     this.save(hpUser1);
                     hpUser = this.get(hpUser1.getId());
                     //用户token作为请求的标准
@@ -771,7 +771,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                     hpUser.setAuthenticationStatus(0);
                     hpUser.setContactStatus(0);
                     hpUser.setUserType("0");
-                    hpUser.setUseFlag(false);
+                    hpUser.setUseFlag(0);
                     hpUser.setMinaOpenid(openId);
                     hpUser.setMinaSessionKey(sessionKey);
                     hpUser.setUnionid(unionId);
@@ -1197,7 +1197,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                 hpUser1 = hpUserList.get(0);
             }
             //判断用户是否注销
-            if (hpUser1.getUseFlag()) {
+            if (hpUser1.getUseFlag()==1 || hpUser1.getUseFlag()==2) {
                 returnMap.put("success", "4000");
                 return returnMap;
             }
@@ -1231,7 +1231,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
             hpUser.setContactStatus(0);
             hpUser.setUserType("0");
             hpUser.setClientId(clientId);
-            hpUser.setUseFlag(false);
+            hpUser.setUseFlag(0);
             this.save(hpUser);
             hpUser1 = this.get(hpUser.getId());
             //用户token作为请求的标准
@@ -1792,7 +1792,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                     }
                 }
                 //判断用户是否注销
-                if (hpUser.getUseFlag()) {
+                if (hpUser.getUseFlag()==1 || hpUser.getUseFlag()==2) {
                     returnMap.put("success", "4000");
                     return returnMap;
                 }
@@ -1949,7 +1949,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                     }
                 }
                 //判断用户是否注销
-                if (hpUser.getUseFlag()) {
+                if (hpUser.getUseFlag()==1 || hpUser.getUseFlag()==2) {
                     returnMap.put("success", "4000");
                     return returnMap;
                 }
@@ -2081,7 +2081,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                         hpUser1.setAuthenticationStatus(0);
                         hpUser1.setContactStatus(0);
                         hpUser1.setUserType("0");
-                        hpUser1.setUseFlag(false);
+                        hpUser1.setUseFlag(0);
                         this.save(hpUser1);
                         hpUser = this.get(hpUser1.getId());
                         //用户token作为请求的标准
@@ -2345,7 +2345,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                         }
                     }
                     //判断用户是否注销
-                    if (hpUser1.getUseFlag()) {
+                    if (hpUser1.getUseFlag()==1 || hpUser1.getUseFlag()==2) {
                         returnMap.put("success", "4000");
                         return returnMap;
                     }
@@ -2480,7 +2480,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                     }
                 }
                 //判断用户是否注销
-                if (hpUser.getUseFlag()) {
+                if (hpUser.getUseFlag()==1 || hpUser.getUseFlag()==2) {
                     returnMap.put("success", "4000");
                     return returnMap;
                 }
@@ -2612,7 +2612,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
                         hpUser1.setAuthenticationStatus(0);
                         hpUser1.setContactStatus(0);
                         hpUser1.setUserType("0");
-                        hpUser1.setUseFlag(false);
+                        hpUser1.setUseFlag(0);
                         this.save(hpUser1);
                         hpUser = this.get(hpUser1.getId());
                         //用户token作为请求的标准
@@ -2744,7 +2744,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
             //验证用户合法性
             if (TokenUtil.validateToken(userId, userToken)) {
                 HpUser hpUser = this.get(userId);
-                hpUser.setUseFlag(true);
+                hpUser.setUseFlag(2);
                 this.save(hpUser);
             } else {
                 returnMap.put("success", "1004");

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/sys/web/HpMemberController.java

@@ -300,7 +300,7 @@ public class HpMemberController extends BaseController {
     public AjaxJson delete(HpMember hpMember) {
         AjaxJson j = new AjaxJson();
         HpUser hpUser = hpMember.getHpUser();
-        hpUser.setUseFlag(true);
+        hpUser.setUseFlag(1);
         hpUserService.save(hpUser);
         j.setMsg("用户已禁用");
         return j;
@@ -316,7 +316,7 @@ public class HpMemberController extends BaseController {
     public AjaxJson againByLogic(HpMember hpMember) {
         AjaxJson j = new AjaxJson();
         HpUser hpUser = hpMember.getHpUser();
-        hpUser.setUseFlag(false);
+        hpUser.setUseFlag(0);
         hpUserService.save(hpUser);
         j.setMsg("用户已解锁");
         return j;

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/sys/web/HpUserController.java

@@ -261,7 +261,7 @@ public class HpUserController extends BaseController {
     @RequestMapping(value = "delete")
     public AjaxJson delete(HpUser hpUser) {
         AjaxJson j = new AjaxJson();
-        hpUser.setUseFlag(true);
+        hpUser.setUseFlag(1);
         hpUserService.deleteByLogic(hpUser);
         j.setMsg("用户已禁用");
         return j;
@@ -275,7 +275,7 @@ public class HpUserController extends BaseController {
     @RequestMapping(value = "again")
     public AjaxJson againByLogic(HpUser hpUser) {
         AjaxJson j = new AjaxJson();
-        hpUser.setUseFlag(false);
+        hpUser.setUseFlag(0);
         hpUserService.deleteByLogic(hpUser);
         j.setMsg("用户已复用");
         return j;

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/sys/wxUtils/TokenUtil.java

@@ -43,7 +43,7 @@ public class TokenUtil {
         try {
             HpUser hpUser = hpUserService.get(userId);
             if (hpUser != null) {
-                return token.equals(hpUser.getUserToken()) && !hpUser.getUseFlag();
+                return token.equals(hpUser.getUserToken()) && hpUser.getUseFlag()==0;
             }
         } catch (Exception e) {
             e.printStackTrace();