diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java index 2b8252f0..eeaf38bd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java @@ -12,7 +12,9 @@ import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.util.JwtUtil; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.*; +import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; +import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.company.vo.CompanyLoginVO; import com.jero.company.vo.Jscode2sessionVO; @@ -24,6 +26,7 @@ import com.jero.modules.system.service.ISysDictService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.BeanUtils; @@ -53,6 +56,8 @@ public class CompanyLoginController { @Autowired private IPayCaseCouncilSubitemService payCaseCouncilSubitemService; @Autowired + private IPayCompanyManagementService payCompanyManagementService; + @Autowired private ISysDictService sysDictService; @Resource private BaseCommonService baseCommonService; @@ -359,6 +364,15 @@ public class CompanyLoginController { }else { contactsManagement.setIsCouncil(1); } + //判断企业角色 + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.eq("id",contactsManagement.getCompanyId()); + PayCompanyManagement one = payCompanyManagementService.getOne(queryWrapper2); + if(ObjectUtils.isEmpty(one)){ + new JeroBootException("联系人无企业信息"); + }else { + contactsManagement.setCompanyRole(one.getRoleCode()); + } // 生成token String token = JwtUtil.sign(phone, syspassword); // 设置token缓存有效时间 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java index 3e361a07..41205abd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java @@ -111,6 +111,10 @@ public class PayContactsManagement implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "是否理事会成员:(1 是,0 否)") private int isCouncil; + /**企业角色1:普通企业、2:会员企业*/ + @TableField(exist = false) + @ApiModelProperty(value = "企业角色1:普通企业、2:会员企业") + private String companyRole; /**创建人*/ @ApiModelProperty(value = "创建人") private String createBy;