Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/sys/contants/UserGuidanceContant.java

@@ -8,7 +8,7 @@ package com.ningdatech.pmapi.sys.contants;
  */
 public interface UserGuidanceContant {
 
-    Integer ALL_FINISHED_NUM = 3;
+    Integer ALL_FINISHED_NUM = 2;
 
     class OrgModel {
         public static final String GUIDANCE_NAME = "配置单位流程";

pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/UserGuidanceManage.java

@@ -84,27 +84,7 @@ public class UserGuidanceManage {
         }
         details.add(orgModelGuidance);
 
-        //2.去查询 财政编码 印章编码
-        UserGuidanceDetailVO fiscalCodeGuidance = new UserGuidanceDetailVO();
-        fiscalCodeGuidance.setName(UserGuidanceContant.FiscalCode.GUIDANCE_NAME);
-        fiscalCodeGuidance.setRemark(UserGuidanceContant.FiscalCode.GUIDANCE_REMARK);
-        fiscalCodeGuidance.setPath(UserGuidanceContant.FiscalCode.GUIDANCE_PATH);
-        CompanyFiscalCode fiscalCode = fiscalCodeService.getOne(Wrappers.lambdaQuery(CompanyFiscalCode.class)
-                .eq(CompanyFiscalCode::getOrganizationCode, empPosUnitCode)
-                .last(BizConst.LIMIT_1));
-        if(Objects.isNull(fiscalCode)){
-            fiscalCodeGuidance.setIsFinish(Boolean.FALSE);
-        }else{
-            //判断fiscalCode是否为空
-            if(StringUtils.isNotBlank(fiscalCode.getFiscalCode())){
-                fiscalCodeGuidance.setIsFinish(Boolean.TRUE);
-                finishedNum ++;
-            }else{
-                fiscalCodeGuidance.setIsFinish(Boolean.FALSE);
-            }
-        }
-        details.add(fiscalCodeGuidance);
-
+        //2.去查询 印章编码
         UserGuidanceDetailVO signatureGuidance = new UserGuidanceDetailVO();
         signatureGuidance.setName(UserGuidanceContant.Signature.GUIDANCE_NAME);
         signatureGuidance.setRemark(UserGuidanceContant.Signature.GUIDANCE_REMARK);