Merge remote-tracking branch 'origin/MVP1.2' into MVP1.2

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java

@@ -527,5 +527,5 @@ public class TSalaryAccount extends BaseEntity {
 	private String salaryMonthEnd;
 
 	@ExcelProperty(value = "导入行号")
-	private int rowIndex;
+	private Integer rowIndex;
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryAccountPhoneController.java

 package com.yifu.cloud.plus.v1.yifu.salary.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
@@ -74,7 +75,7 @@ public class TSalaryAccountPhoneController {
 			List<TSalaryAccount> list = salaryAccountService.list(Wrappers.<TSalaryAccount>lambdaQuery()
 					.eq(TSalaryAccount::getEmpIdcard, idNumber)
 					.eq(TSalaryAccount::getDeleteFlag, CommonConstants.ZERO_INT)
-					.eq(TSalaryAccount::getDistributionFlag, CommonConstants.ONE_STRING)
+					.eq(TSalaryAccount::getSendStatus, CommonConstants.ONE_STRING)
 					.last(SORT_COL.concat(CommonConstants.LAST_ONE_SQL)));
 			//查实发工资
 			if (Common.isNotNull(list)) {
@@ -87,7 +88,7 @@ public class TSalaryAccountPhoneController {
 			List<TSalaryAccount> list = salaryAccountService.list(Wrappers.<TSalaryAccount>lambdaQuery()
 					.eq(TSalaryAccount::getEmpIdcard, idNumber)
 					.eq(TSalaryAccount::getDeleteFlag, CommonConstants.ZERO_INT)
-					.eq(TSalaryAccount::getDistributionFlag, CommonConstants.ONE_STRING)
+					.eq(TSalaryAccount::getSendStatus, CommonConstants.ONE_STRING)
 					.likeRight(TSalaryAccount::getSalaryMonth, year).last(SORT_COL));
 			//查实发工资
 			if (Common.isNotNull(list)) {
@@ -180,8 +181,10 @@ public class TSalaryAccountPhoneController {
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryEmployee>
 	 **/
 	private R<TSalaryEmployee> getUserCount(TSalaryEmployee em) {
+		SysUser user = new SysUser();
+		user.setUsername(em.getEmpIdcard());
 		R<Integer> userCount = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(), daprUpmsProperties.getAppId()
-				, "/user/inner/getCountByIdCard", em.getEmpIdcard(), Integer.class, SecurityConstants.FROM_IN);
+				, "/user/inner/getCountByIdCard", user, Integer.class, SecurityConstants.FROM_IN);
 		if (userCount != null && userCount.getData() != null && userCount.getData() > CommonConstants.ZERO_INT) {
 			return R.other(CommonConstants.TWO_INT, "该身份已被绑定，请联系客服热线:0551 - 63535213！！");
 		}

yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserController.java

@@ -413,16 +413,15 @@ public class UserController {
 	}
 
 	/**
-	 * @param idCard
 	 * @Description: 获取C端用户是否存在
 	 * @Author: hgw
 	 * @Date: 2022/12/13 14:50
 	 * @return: java.lang.Integer
 	 **/
 	@Inner
-	@GetMapping("/inner/getCountByIdCard")
-	public Integer getCountByIdCard(@RequestParam String idCard) {
-		return (int) userService.count(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getUsername, idCard)
+	@PostMapping("/inner/getCountByIdCard")
+	public Integer getCountByIdCard(@RequestBody SysUser user) {
+		return (int) userService.count(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getUsername, user.getUsername())
 				.eq(SysUser::getDelFlag, CommonConstants.ZERO_STRING)
 				.isNotNull(SysUser::getWxOpenid));
 	}