add:是否为理事会成员

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java

@@ -3,6 +3,7 @@ package com.jero.company.controller;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.CommonConstant;
@@ -15,6 +16,8 @@ import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayContactsManagementService;
 import com.jero.company.vo.CompanyLoginVO;
 import com.jero.company.vo.Jscode2sessionVO;
+import com.jero.data.entity.PayCaseCouncilSubitem;
+import com.jero.data.service.IPayCaseCouncilSubitemService;
 import com.jero.modules.base.service.BaseCommonService;
 import com.jero.modules.system.model.SysLoginModel;
 import com.jero.modules.system.service.ISysDictService;
@@ -27,7 +30,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
@@ -49,6 +51,8 @@ public class CompanyLoginController {
     @Autowired
     private IPayContactsManagementService payContactsManagementService;
     @Autowired
+    private IPayCaseCouncilSubitemService payCaseCouncilSubitemService;
+    @Autowired
     private ISysDictService sysDictService;
     @Resource
     private BaseCommonService baseCommonService;
@@ -346,6 +350,15 @@ public class CompanyLoginController {
         if (Objects.isNull(syspassword)) {
             syspassword = defaultPassword;
         }
+        //判断是否未理事会成员
+        QueryWrapper<PayCaseCouncilSubitem> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("contacts_id",contactsManagement.getId());
+        int count = payCaseCouncilSubitemService.count(queryWrapper);
+        if(count==0){
+            contactsManagement.setIsCouncil(0);
+        }else {
+            contactsManagement.setIsCouncil(1);
+        }
         // 生成token
         String token = JwtUtil.sign(phone, syspassword);
         // 设置token缓存有效时间
@@ -353,7 +366,6 @@ public class CompanyLoginController {
         redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
 
         JSONObject obj = new JSONObject();
-
         obj.put("token", token);
         obj.put("userInfo", contactsManagement);
         obj.put("sysAllDictItems", sysDictService.queryAllDictItems());

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java

@@ -155,8 +155,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 		if(!StringUtils.isBlank(payCompanyManagement.getCompanyName()) && payCompanyManagement.getCompanyName().length() > 50){
 			return Result.error("企业名称长度不能大于50个字符！");
 		}
-		//此处只做约束理事会添加成员
+		//此处只做约束理事会添加成员（MemberNature）
-		if(!StringUtils.isBlank(payCompanyManagement.getMemberNature()) && !"2".equals(payCompanyManagement.getMemberNature())){
+		if(!StringUtils.isBlank(payCompanyManagement.getMemberNature()) && !"2".equals(payCompanyManagement.getMemberNature())&& !"1".equals(payCompanyManagement.getMemberNature())){
 			return Result.error("理事会标识错误");
 		}
 		QueryWrapper<PayCompanyManagement> queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap());

jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java

@@ -104,9 +104,13 @@ public class PayContactsManagement implements Serializable {
     @ApiModelProperty(value = "备注")
     @Size(max = 200, message = "备注长度不能大于200个字符")
     private String remarks;
-    /**会员性质字段*/
+
-    @ApiModelProperty(value = "会员性质字段")
+    @ApiModelProperty(value = "会员性质")
     private String memberNature;
+    /**是否理事会成员*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "是否理事会成员:(1 是，0 否)")
+    private int isCouncil;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
@@ -157,4 +161,5 @@ public class PayContactsManagement implements Serializable {
      */
     @ApiModelProperty(value = "删除状态")
     private String delFlag;
+
 }