MVP8号版本

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java

@@ -204,7 +204,7 @@ public interface CommonConstants {
 	 * @Author pwang
 	 * @Date 2019-08-02 16:39
 	 **/
-	int[] dingleDigitIntArray = {0,1,2,3,4,5,6,7,8,9};
+	int[] dingleDigitIntArray = {0,1,2,3,4,5,6,7,8,9,10,11,12};
 	/**
 	 * 个位数字串（阿里编码规约不允许直接使用‘魔法值’）
 	 * @Author pwang

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java

@@ -337,8 +337,5 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description = "退回原因")
 	private String backRemark;
 
-	@Schema(description = "用于重新推送的状态")
-	private String errorStatus;
-
 	private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/UpdateOverdueTask.java

@@ -33,17 +33,4 @@ public class UpdateOverdueTask {
 		HttpDaprUtil.invokeMethodPost(daprInsurancesProperties.getAppUrl(),daprInsurancesProperties.getAppId(),"/insuranceDetail/inner/updateOverdueByTask","", Void.class, SecurityConstants.FROM_IN);
 		log.info("------------更新商险到期-定时任务结束------------");
 	}
-
-	/**
-	 * 更新商险到期定时任务
-	 *
-	 * @author licancan
-	 * @param
-	 * @return void
-	 */
-	public void pushInsEkp() throws Exception {
-		log.info("-------------推送商险待结算数据-定时任务开始------------");
-		HttpDaprUtil.invokeMethodPost(daprInsurancesProperties.getAppUrl(),daprInsurancesProperties.getAppId(),"/insuranceDetail/inner/pushActualPremium","", Void.class, SecurityConstants.FROM_IN);
-		log.info("------------推送商险待结算数据-定时任务结束------------");
-	}
 }

yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysDeptServiceImpl.java

@@ -30,7 +30,6 @@ import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysDeptMapper;
 import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysUserMapper;
 import com.yifu.cloud.plus.v1.yifu.admin.service.SysDeptRelationService;
 import com.yifu.cloud.plus.v1.yifu.admin.service.SysDeptService;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.ldap.util.LdapUtil;
@@ -212,7 +211,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 							if (Common.isNotNull(entry.getAttributeValue("x-ouid"))) {
 								insertSysDept.setDeptId(Long.valueOf(entry.getAttributeValue("x-ouid")));
 							}
-							insertSysDept.setDelFlag(CommonConstants.ZERO_STRING);
 							baseMapper.insert(insertSysDept);
 						}
 					}
@@ -222,7 +220,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 				}
 			} else {
 				try {
-					SysDept sysDept = baseMapper.selectDeptDn(dn.substring(dn.indexOf("ou=", 2), dn.length()));
+					SysDept sysDept = this.getOne(Wrappers.<SysDept>query().lambda().eq(SysDept::getDeptDn, dn.substring(dn.indexOf("ou=", 2), dn.length())));
 					if (null != sysDept) {
 						SysDept sysDeptCount = baseMapper.selectDeptDn(dn);
 						if (null == sysDeptCount) {
@@ -241,7 +239,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 									if (Common.isNotNull(entry.getAttributeValue("x-ouid"))) {
 										insertSysDept.setDeptId(Long.valueOf(entry.getAttributeValue("x-ouid")));
 									}
-									insertSysDept.setDelFlag(CommonConstants.ZERO_STRING);
 									baseMapper.insert(insertSysDept);
 								}
 							}