From d718b7bc81681e2cac5ffc1a7d6ef08cbccbbfad Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Fri, 29 Jan 2021 09:58:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E4=BC=81=E4=B8=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/bootstrap.properties   | 84 +++++++++----------
 .../mapper/crms/CrmsCompanyPersonalMapper.xml |  2 +-
 .../DgComplianceAssignUserController.java     | 20 -----
 .../mapper/DgComplianceAssignUserMapper.java  | 18 ----
 .../model/response/AssetsDetailResponse.java  |  8 +-
 .../model/response/AuditOpinionResponse.java  |  6 +-
 .../response/GuaranteeDetailResponse.java     |  8 +-
 .../model/response/MessageDetailResponse.java |  8 +-
 .../IDgComplianceAssignUserService.java       | 16 ----
 .../impl/DgApplyAmountInfoServiceImpl.java    |  4 +-
 .../DgAssetsInvestigationServiceImpl.java     | 13 ++-
 .../DgComplianceAssignUserServiceImpl.java    | 20 -----
 .../DgGuaranteeAssignUserServiceImpl.java     | 13 ++-
 .../DgMessageInvestigationServiceImpl.java    | 13 ++-
 .../DgWorkConferenceConsiderServiceImpl.java  |  3 +-
 .../src/main/resources/bootstrap.properties   | 82 +++++++++---------
 .../DgComplianceAssignUserMapper.xml          | 20 -----
 .../controller/UserLoginController.java       |  5 +-
 .../AdminAuthenticationProcessingFilter.java  |  1 +
 .../handle/AdminAuthenticationProvider.java   |  2 +
 .../service/impl/UserLoginServiceImpl.java    |  1 +
 .../hrauth/service/impl/UserServiceImpl.java  | 14 ++--
 .../src/main/resources/bootstrap.properties   | 84 +++++++++----------
 .../model/response/PromptSuccess.java         |  8 +-
 .../guarantee/DgComplianceAssignUser.java     | 79 -----------------
 25 files changed, 201 insertions(+), 331 deletions(-)
 delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceAssignUserController.java
 delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceAssignUserMapper.java
 delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceAssignUserService.java
 delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceAssignUserServiceImpl.java
 delete mode 100644 dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceAssignUserMapper.xml
 delete mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgComplianceAssignUser.java

diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties
index ef21949d..2056f353 100644
--- a/dq-financial-crms/src/main/resources/bootstrap.properties
+++ b/dq-financial-crms/src/main/resources/bootstrap.properties
@@ -1,20 +1,20 @@
 #服务名称
-spring.application.name=dq-financial-crms
-#配置中心地址
-spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-spring.cloud.nacos.config.file-extension=yml
-#redis配置
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=
-spring.redis.database=0
-spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+#spring.application.name=dq-financial-crms
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+#spring.cloud.nacos.config.file-extension=yml
+##redis配置
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
 #本地测试环境
-spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
 
 #线上测试环境
 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@@ -29,30 +29,30 @@ ribbon.ConnectTimeout: 120000
 
 # 正式环境（prod）
 #服务名称
-#spring.application.name=dq-financial-crms
-###配置中心地址
-#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-#spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd
-##spring.cloud.nacos.config.group=prod
-#
-#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-#spring.cloud.nacos.config.ext-config[0].group=prod
-#spring.cloud.nacos.config.ext-config[0].refresh=true
-#
-#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-#spring.cloud.nacos.config.ext-config[1].group=prod
-#spring.cloud.nacos.config.ext-config[1].refresh=true
-#
-#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-#spring.cloud.nacos.config.ext-config[2].group=prod
-#spring.cloud.nacos.config.ext-config[2].refresh=true
-#
-#spring.redis.host=127.0.0.1
-#spring.redis.port=6379
-#spring.redis.password=dq123456
-#spring.redis.database=0
-#spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
+spring.application.name=dq-financial-crms
+##配置中心地址
+spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd
+#spring.cloud.nacos.config.group=prod
+
+spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+spring.cloud.nacos.config.ext-config[0].group=prod
+spring.cloud.nacos.config.ext-config[0].refresh=true
+
+spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+spring.cloud.nacos.config.ext-config[1].group=prod
+spring.cloud.nacos.config.ext-config[1].refresh=true
+
+spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+spring.cloud.nacos.config.ext-config[2].group=prod
+spring.cloud.nacos.config.ext-config[2].refresh=true
+
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=dq123456
+spring.redis.database=0
+spring.redis.timeout=30000
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CrmsCompanyPersonalMapper.xml b/dq-financial-crms/src/main/resources/mapper/crms/CrmsCompanyPersonalMapper.xml
index 14d08185..a8b8c2d5 100644
--- a/dq-financial-crms/src/main/resources/mapper/crms/CrmsCompanyPersonalMapper.xml
+++ b/dq-financial-crms/src/main/resources/mapper/crms/CrmsCompanyPersonalMapper.xml
@@ -31,7 +31,7 @@
     </update>
 
     <select id="pageByCondition" resultMap="BaseResultMap">
-        select cp.id,cp.relationship,cp.`type`,cp.related_name,cp.phone,cp.address
+        select cp.*
         from crms_company_personal cp
         left join crms_customer_related cr on cr.related_id=cp.id
         <where>
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceAssignUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceAssignUserController.java
deleted file mode 100644
index a92142bb..00000000
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceAssignUserController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.daqing.financial.guarantee.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 合规调查记录 前端控制器
- * </p>
- *
- * @author Qyq
- * @since 2020-11-05
- */
-@RestController
-@RequestMapping("/dg-compliance-assign-user")
-public class DgComplianceAssignUserController {
-
-}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceAssignUserMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceAssignUserMapper.java
deleted file mode 100644
index 040ec7fa..00000000
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceAssignUserMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.daqing.financial.guarantee.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.daqing.framework.domain.guarantee.DgComplianceAssignUser;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 合规调查记录 Mapper 接口
- * </p>
- *
- * @author Qyq
- * @since 2020-11-05
- */
-@Mapper
-public interface DgComplianceAssignUserMapper extends BaseMapper<DgComplianceAssignUser> {
-
-}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AssetsDetailResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AssetsDetailResponse.java
index c9cd22db..7151150a 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AssetsDetailResponse.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AssetsDetailResponse.java
@@ -3,6 +3,7 @@ package com.daqing.financial.guarantee.model.response;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.daqing.framework.domain.guarantee.DgAssetsAssessmentAssetsLog;
+import com.daqing.framework.domain.guarantee.DgBusinessCompany;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
@@ -31,8 +32,8 @@ public class AssetsDetailResponse implements Serializable {
     /**
      * 企业详细
      */
-    @ApiModelProperty(value = "企业详细")
-    private LinkedHashMap linkedHashMap;
+/*    @ApiModelProperty(value = "企业详细")
+    private LinkedHashMap linkedHashMap;*/
 
     /**
      * 资产调查详细
@@ -40,4 +41,7 @@ public class AssetsDetailResponse implements Serializable {
     @ApiModelProperty(value = "资产调查详细")
     private DgAssetsInvestigationResponse assetsResponse;
 
+    @ApiModelProperty(value = "企业详细")
+    private DgBusinessCompany dgBusinessCompany;
+
 }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AuditOpinionResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AuditOpinionResponse.java
index 10459952..65a53534 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AuditOpinionResponse.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AuditOpinionResponse.java
@@ -1,5 +1,6 @@
 package com.daqing.financial.guarantee.model.response;
 
+import com.daqing.framework.domain.guarantee.DgBusinessCompany;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -78,6 +79,9 @@ public class AuditOpinionResponse implements Serializable {
     /**
      * 企业详细
      */
+/*    @ApiModelProperty(value = "企业详细")
+    private LinkedHashMap linkedHashMap;*/
+
     @ApiModelProperty(value = "企业详细")
-    private LinkedHashMap linkedHashMap;
+    private DgBusinessCompany dgBusinessCompany;
 }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeDetailResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeDetailResponse.java
index 423594cf..4d2b1b57 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeDetailResponse.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeDetailResponse.java
@@ -2,6 +2,7 @@ package com.daqing.financial.guarantee.model.response;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.daqing.framework.domain.guarantee.DgBusinessCompany;
 import com.daqing.framework.domain.guarantee.DgGuaranteeAssignUser;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,8 +31,8 @@ public class GuaranteeDetailResponse implements Serializable {
     /**
      * 企业详细
      */
-    @ApiModelProperty(value = "企业详细")
-    private LinkedHashMap linkedHashMap;
+/*    @ApiModelProperty(value = "企业详细")
+    private LinkedHashMap linkedHashMap;*/
 
     /**
      * 附件详细
@@ -45,5 +46,8 @@ public class GuaranteeDetailResponse implements Serializable {
     @ApiModelProperty(value = "担保详细")
     private DgGuaranteeAssignUserResponse assignUser;
 
+    @ApiModelProperty(value = "企业详细")
+    private DgBusinessCompany dgBusinessCompany;
+
 
 }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MessageDetailResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MessageDetailResponse.java
index 556103bf..47f012ca 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MessageDetailResponse.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MessageDetailResponse.java
@@ -2,6 +2,7 @@ package com.daqing.financial.guarantee.model.response;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.daqing.framework.domain.guarantee.DgBusinessCompany;
 import com.daqing.framework.domain.guarantee.DgMessageInvestigation;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,8 +32,8 @@ public class MessageDetailResponse implements Serializable {
     /**
      * 企业详细
      */
-    @ApiModelProperty(value = "企业详细")
-    private LinkedHashMap linkedHashMap;
+/*    @ApiModelProperty(value = "企业详细")
+    private LinkedHashMap linkedHashMap;*/
 
     /**
      * 附件详细
@@ -49,4 +50,7 @@ public class MessageDetailResponse implements Serializable {
     @ApiModelProperty(value = "信息部调查专员")
     private String CName;
 
+    @ApiModelProperty(value = "企业详细")
+    private DgBusinessCompany dgBusinessCompany;
+
 }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceAssignUserService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceAssignUserService.java
deleted file mode 100644
index 499fd5a0..00000000
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceAssignUserService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.daqing.financial.guarantee.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.daqing.framework.domain.guarantee.DgComplianceAssignUser;
-
-/**
- * <p>
- * 合规调查记录 服务类
- * </p>
- *
- * @author Qyq
- * @since 2020-11-05
- */
-public interface IDgComplianceAssignUserService extends IService<DgComplianceAssignUser> {
-
-}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
index 7ac25c14..23b8e98c 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
@@ -156,7 +156,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         String timeCode=dateTime.replaceAll("-","");
         int count = dgApplyAmountInfoMapper.selectBusinessTaday(dateTime);
         if(count ==0){//今天没有申请过业务，所以编号从001开始
-            if(businessApplication.getBusinessType().equals("融资担保")){//融资业务：RZ-20201231001
+            if(businessApplication.getBusinessType()!= null && businessApplication.getBusinessType().equals("融资担保")){//融资业务：RZ-20201231001
                 businessCode="RZ-"+timeCode+"001";
             }else{//非融资业务：FRZ-20201231001
                 businessCode="FRZ-"+timeCode+"001";
@@ -166,7 +166,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
             String code = dgApplyAmountInfoMapper.selectMaxBusinessTaday(dateTime);
             int codeNumber = Integer.parseInt(code.substring(code.length() - 3));
             String newBusinessCode = String.format("%03d", (codeNumber + 1));
-            if(businessApplication.getBusinessType().equals("融资担保")){//融资业务：RZ-20201231001
+            if(businessApplication.getBusinessType()!= null && businessApplication.getBusinessType().equals("融资担保")){//融资业务：RZ-20201231001
                 businessCode="RZ-"+timeCode+newBusinessCode;
             }else{//非融资业务：FRZ-20201231001
                 businessCode="FRZ-"+timeCode+newBusinessCode;
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java
index 22269349..7b90cfbc 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java
@@ -82,6 +82,8 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
     private DgComplianceInvestigationMapper dgComplianceInvestigationMapper;
     @Resource
     private DgBusinessProcessStatusMapper dgBusinessProcessStatusMapper;
+    @Resource
+    private DgBusinessCompanyMapper dgBusinessCompanyMapper;
 
     @Override
     public PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, List<String> roleIdlist, String userId, Integer status) {
@@ -228,9 +230,13 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
         DgApplyAmountInfoRequest applyAmountInfo = new DgApplyAmountInfoRequest();
         applyAmountInfo.setCompanyId(dgApplyAmountInfo.getCompanyId());
         //根据企业id查询企业详情
-        ResponseResult result = crmsFeignService.queryCustomerInfoById(applyAmountInfo);
+/*        ResponseResult result = crmsFeignService.queryCustomerInfoById(applyAmountInfo);
+
+        LinkedHashMap linkedList = (LinkedHashMap)result.getData();*/
 
-        LinkedHashMap linkedList = (LinkedHashMap)result.getData();
+        //根据业务id查询备份企业信息
+        DgBusinessCompany dgBusinessCompany = dgBusinessCompanyMapper.selectOne(new QueryWrapper<DgBusinessCompany>()
+                .eq("business_id", assetsResponse.getBusinessId()));
 
         //查询该业务id下对应的C角
         DgAssetsInvestigation assetsInvestigate = this.baseMapper.selectOne(new QueryWrapper<DgAssetsInvestigation>()
@@ -248,7 +254,8 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
 
         AssetsDetailResponse assetsDetailResponse = new AssetsDetailResponse();
         assetsDetailResponse.setDgApplyAmountInfo(dgApplyAmountInfo);
-        assetsDetailResponse.setLinkedHashMap(linkedList);
+        assetsDetailResponse.setDgBusinessCompany(dgBusinessCompany);
+        //assetsDetailResponse.setLinkedHashMap(linkedList);
         assetsDetailResponse.setAssetsResponse(assetsResponse);
 
         return assetsDetailResponse;
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceAssignUserServiceImpl.java
deleted file mode 100644
index 871f4698..00000000
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceAssignUserServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.daqing.financial.guarantee.service.impl;
-
-import com.daqing.financial.guarantee.mapper.DgComplianceAssignUserMapper;
-import com.daqing.financial.guarantee.service.IDgComplianceAssignUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.daqing.framework.domain.guarantee.DgComplianceAssignUser;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 合规调查记录 服务实现类
- * </p>
- *
- * @author Qyq
- * @since 2020-11-05
- */
-@Service
-public class DgComplianceAssignUserServiceImpl extends ServiceImpl<DgComplianceAssignUserMapper, DgComplianceAssignUser> implements IDgComplianceAssignUserService {
-
-}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
index c76026f3..23bfdf45 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
@@ -86,6 +86,8 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
     private DgGuaranteeAssignUserMapper dgGuaranteeAssignUserMapper;
     @Resource
     private HrmsFeignService hrmsFeignService;
+    @Resource
+    private DgBusinessCompanyMapper dgBusinessCompanyMapper;
 
 
     @Override
@@ -121,10 +123,14 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
 
         DgApplyAmountInfoRequest applyAmountInfo = new DgApplyAmountInfoRequest();
         applyAmountInfo.setCompanyId(dgApplyAmountInfo.getCompanyId());
-        //根据企业id查询企业详情
+/*        //根据企业id查询企业详情
         ResponseResult result = crmsFeignService.queryCustomerInfoById(applyAmountInfo);
 
-        LinkedHashMap linkedList = (LinkedHashMap) result.getData();
+        LinkedHashMap linkedList = (LinkedHashMap) result.getData();*/
+
+        //根据业务id查询备份企业信息
+        DgBusinessCompany dgBusinessCompany = dgBusinessCompanyMapper.selectOne(new QueryWrapper<DgBusinessCompany>()
+                .eq("business_id", guaranteeAssignUser.getBusinessId()));
 
         //查询附件详细，附件关联业务主键id
         DgEnclosureInfoResponse dgEnclosureInfo = dgEnclosureInfoMapper.selectByCompanyId(guaranteeAssignUser.getBusinessId());
@@ -216,7 +222,8 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         GuaranteeDetailResponse guaranteeDetailResponse = new GuaranteeDetailResponse();
         guaranteeDetailResponse.setDgApplyAmountInfo(dgApplyAmountInfo);
         guaranteeDetailResponse.setDgEnclosureInfo(dgEnclosureInfo);
-        guaranteeDetailResponse.setLinkedHashMap(linkedList);
+        guaranteeDetailResponse.setDgBusinessCompany(dgBusinessCompany);
+        //guaranteeDetailResponse.setLinkedHashMap(linkedList);
         guaranteeDetailResponse.setAssignUser(assignUser);
         return guaranteeDetailResponse;
     }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
index defc13b7..6f0aa936 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
@@ -82,6 +82,8 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
     private DgComplianceInvestigationMapper dgComplianceInvestigationMapper;
     @Resource
     private DgBusinessProcessStatusMapper dgBusinessProcessStatusMapper;
+    @Resource
+    private DgBusinessCompanyMapper dgBusinessCompanyMapper;
 
     @Override
     public PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, List<String> roleIdlist, String userId, Integer status) {
@@ -196,9 +198,13 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
         DgApplyAmountInfoRequest applyAmountInfo = new DgApplyAmountInfoRequest();
         applyAmountInfo.setCompanyId(dgApplyAmountInfo.getCompanyId());
         //根据企业id查询企业详情
-        ResponseResult result = crmsFeignService.queryCustomerInfoById(applyAmountInfo);
+/*        ResponseResult result = crmsFeignService.queryCustomerInfoById(applyAmountInfo);
+
+        LinkedHashMap linkedList = (LinkedHashMap)result.getData();*/
 
-        LinkedHashMap linkedList = (LinkedHashMap)result.getData();
+        //根据业务id查询备份企业信息
+        DgBusinessCompany dgBusinessCompany = dgBusinessCompanyMapper.selectOne(new QueryWrapper<DgBusinessCompany>()
+                .eq("business_id", dgMessageInvestigation.getBusinessId()));
 
         //查询附件详细，附件关联业务主键id
         DgEnclosureInfoResponse dgEnclosureInfo = dgEnclosureInfoMapper.selectByCompanyId(dgMessageInvestigation.getBusinessId());
@@ -263,7 +269,8 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
 
         messageDetailResponse.setDgApplyAmountInfo(dgApplyAmountInfo);
         messageDetailResponse.setDgEnclosureInfo(dgEnclosureInfo);
-        messageDetailResponse.setLinkedHashMap(linkedList);
+        messageDetailResponse.setDgBusinessCompany(dgBusinessCompany);
+        //messageDetailResponse.setLinkedHashMap(linkedList);
         messageDetailResponse.setDgMessageInvestigation(dgMessageInvestigation);
         return messageDetailResponse;
     }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java
index d0103a53..dbe29f1c 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java
@@ -320,7 +320,8 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
         if (guaranteeId != null) {
             GuaranteeDetailResponse guaranteeDetailResponse = guaranteeAssignUserService.guaranteeDetail(guaranteeId);
             auditOpinionResponse.setDgApplyAmountInfo(guaranteeDetailResponse.getDgApplyAmountInfo());
-            auditOpinionResponse.setLinkedHashMap(guaranteeDetailResponse.getLinkedHashMap());
+            //auditOpinionResponse.setLinkedHashMap(guaranteeDetailResponse.getLinkedHashMap());
+            auditOpinionResponse.setDgBusinessCompany(guaranteeDetailResponse.getDgBusinessCompany());
         }
         return auditOpinionResponse;
     }
diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties
index 4dfa4dac..69a06a1a 100644
--- a/dq-financial-guarantee/src/main/resources/bootstrap.properties
+++ b/dq-financial-guarantee/src/main/resources/bootstrap.properties
@@ -1,21 +1,21 @@
 #服务名称
-spring.application.name=dq-financial-guarantee
-#配置中心地址
-spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-spring.cloud.nacos.config.file-extension=yml
-#redis配置
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=
-spring.redis.database=0
-spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+#spring.application.name=dq-financial-guarantee
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+#spring.cloud.nacos.config.file-extension=yml
+##redis配置
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
 
 #本地测试环境
-spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
 
 #线上测试环境
 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@@ -36,29 +36,29 @@ ribbon.ConnectTimeout: 120000
 #
 ##正式环境（prod）
 ##服务名称
-#spring.application.name=dq-financial-guarantee
-##配置中心地址
-#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-#spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826
-#
-#spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
-#spring.cloud.nacos.config.ext-config[0].group=prod
-#spring.cloud.nacos.config.ext-config[0].refresh=true
-#
-#spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
-#spring.cloud.nacos.config.ext-config[1].group=prod
-#spring.cloud.nacos.config.ext-config[1].refresh=true
-#
-#spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
-#spring.cloud.nacos.config.ext-config[2].group=prod
-#spring.cloud.nacos.config.ext-config[2].refresh=true
-#
-#spring.redis.host=127.0.0.1
-#spring.redis.port=6379
-#spring.redis.password=dq123456
-#spring.redis.database=0
-#spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
+spring.application.name=dq-financial-guarantee
+#配置中心地址
+spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826
+
+spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
+spring.cloud.nacos.config.ext-config[0].group=prod
+spring.cloud.nacos.config.ext-config[0].refresh=true
+
+spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
+spring.cloud.nacos.config.ext-config[1].group=prod
+spring.cloud.nacos.config.ext-config[1].refresh=true
+
+spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
+spring.cloud.nacos.config.ext-config[2].group=prod
+spring.cloud.nacos.config.ext-config[2].refresh=true
+
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=dq123456
+spring.redis.database=0
+spring.redis.timeout=30000
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceAssignUserMapper.xml
deleted file mode 100644
index 972830ad..00000000
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceAssignUserMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.daqing.financial.guarantee.mapper.DgComplianceAssignUserMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.DgComplianceAssignUser">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="emp_id" property="empId" />
-        <result column="type" property="type" />
-        <result column="status" property="status" />
-        <result column="amount" property="amount" />
-        <result column="term" property="term" />
-        <result column="remark" property="remark" />
-        <result column="apply_content" property="applyContent" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>
diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java
index a10e52bf..f4a4f6b6 100644
--- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java
+++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java
@@ -98,6 +98,7 @@ public class UserLoginController implements UserLoginControllerApi {
         loginRequest.setWechatId(wechatId);
         loginRequest.setPassword(password);
         loginRequest.setPhone(phone);*/
+        System.out.println("wechatId================"+loginRequest.getWechatId());
         return userLoginService.login(loginRequest);
     }
 
@@ -165,8 +166,8 @@ public class UserLoginController implements UserLoginControllerApi {
                   headerImg = URLDecoder.decode(imgUrl,encoder);
                 //account = new String(username.getBytes("GBK"),"iso-8859-1");
                 log.info("account==========="+account+"headerImg============="+headerImg);
-                response.sendRedirect("http://8.129.127.185/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
-                //response.sendRedirect("https://www.huorantech.cn/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
+                //response.sendRedirect("http://8.129.127.185/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
+                response.sendRedirect("https://www.huorantech.cn/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
             }
         }else {
             userService.weChatBinding(code,response,state);
diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/filter/AdminAuthenticationProcessingFilter.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/filter/AdminAuthenticationProcessingFilter.java
index b9b695f1..b126ade6 100644
--- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/filter/AdminAuthenticationProcessingFilter.java
+++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/filter/AdminAuthenticationProcessingFilter.java
@@ -63,6 +63,7 @@ public class AdminAuthenticationProcessingFilter extends AbstractAuthenticationP
             map.put("tenDayEffective",tenDayEffective);
             map.put("type",type);
             map.put("userName",userName);
+            map.put("wechatId",user.getWechatId());
             // 将前端传递的数据转换成jsonBean数据格式
             //UserEntity user = JSONObject.parseObject(wrappedRequest.getBodyJsonStrByJson(wrappedRequest), UserEntity.class);
             authRequest = new MyAuthenticationToken(userName, user.getPassword(),null, map);
diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/handle/AdminAuthenticationProvider.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/handle/AdminAuthenticationProvider.java
index 69706cea..d3aa8307 100644
--- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/handle/AdminAuthenticationProvider.java
+++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/handle/AdminAuthenticationProvider.java
@@ -43,6 +43,7 @@ public class AdminAuthenticationProvider implements AuthenticationProvider {
         MyAuthenticationToken authRequest=(MyAuthenticationToken)authentication;
         String tenDayEffective= MapUtils.getString(authRequest.getParam(),"tenDayEffective","1");
         String type= MapUtils.getString(authRequest.getParam(),"type","1");
+        String wechatId= MapUtils.getString(authRequest.getParam(),"wechatId",null);
         String userName = MapUtils.getString(authRequest.getParam(),"userName",null);
         // 获取前端表单中输入后返回的用户名、密码
         //String userName = (String) authentication.getPrincipal();
@@ -53,6 +54,7 @@ public class AdminAuthenticationProvider implements AuthenticationProvider {
         loginRequest.setPassword(password);
         loginRequest.setTenDayEffective(Integer.parseInt(tenDayEffective));
         loginRequest.setType(Integer.parseInt(type));
+        loginRequest.setWechatId(wechatId);
         ResponseResult login = userLoginService.login(loginRequest);
         LoginResponse data = (LoginResponse) login.getData();
 
diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java
index 00c01812..e178d779 100644
--- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java
+++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java
@@ -129,6 +129,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginDao, UserEntity>
 
     @Transactional
     public ResponseResult login(LoginRequest loginRequest) {
+        System.out.println("wechatId222================"+loginRequest.getWechatId());
         //判断用户登录方式
         UserEntity userEntity = baseMapper.login(loginRequest);
         String name = null;
diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java
index bd3a66ce..33b5a1c6 100644
--- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java
+++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java
@@ -58,7 +58,7 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
         if(baseMap == null || baseMap.isEmpty()){ return  null; }
         String accessToken = (String)baseMap.get("access_token");
         String openId  = (String) baseMap.get("openid");
-
+        System.out.println("微信扫码加密前openId============="+openId);
         //对code(回调过来的openid)加密
         String md5OpenId = Md5Util.md5(openId);
         log.info("accessToken========> "+accessToken+"openId========> "+openId+"code=======> "+code+"md5OpenId============>"+md5OpenId);
@@ -90,8 +90,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
         if(dbUser == null){//openId不存在，返回绑定手机号页面,须另写绑定手机号接口
             log.info("dbUser为空，openId不存在，请先绑定手机号哦~~~");
             try {
-                //response.sendRedirect("https://www.huorantech.cn/index/#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面
-                response.sendRedirect("http://8.129.127.185/dq/index.html#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面
+                response.sendRedirect("https://www.huorantech.cn/index/#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面
+                //response.sendRedirect("http://8.129.127.185/dq/index.html#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -152,8 +152,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
         if (countWeChatId > 0){
                 try {
                     log.info("微信重复了,我走到了这里.............................");
-                    //response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token+"&message=1");
-                    response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token+"&message=1");
+                    response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token+"&message=1");
+                    //response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token+"&message=1");
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
@@ -163,8 +163,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
             if (result){
                 try {
                     log.info("转发成功---------------------------------------");
-                    //response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token);
-                    response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token);
+                    response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token);
+                    //response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token);
                 }catch (IOException e){
                     e.printStackTrace();
                 }
diff --git a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties
index e9e39d8f..8c32f2a7 100644
--- a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties
+++ b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties
@@ -1,21 +1,21 @@
 #服务名称
-spring.application.name=dq-financial-hrms-auth
-#配置中心地址
-spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-spring.cloud.nacos.config.file-extension=yml
-#redis配置
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=
-spring.redis.database=0
-spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+#spring.application.name=dq-financial-hrms-auth
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+#spring.cloud.nacos.config.file-extension=yml
+##redis配置
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
 
 #本地测试环境
-spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
 
 #线上测试环境
 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@@ -30,30 +30,30 @@ ribbon.ConnectTimeout: 30000
 
 
 #正式环境（prod）
-#spring.application.name=dq-financial-hrms-auth
-#
-#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-#spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4
-##spring.cloud.nacos.config.group=prod
-#
-#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-#spring.cloud.nacos.config.ext-config[0].group=prod
-#spring.cloud.nacos.config.ext-config[0].refresh=true
-#
-#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-#spring.cloud.nacos.config.ext-config[1].group=prod
-#spring.cloud.nacos.config.ext-config[1].refresh=true
-#
-#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-#spring.cloud.nacos.config.ext-config[2].group=prod
-#spring.cloud.nacos.config.ext-config[2].refresh=true
-#
-#spring.redis.host=127.0.0.1
-#spring.redis.port=6379
-#spring.redis.password=dq123456
-#spring.redis.database=0
-#spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
+spring.application.name=dq-financial-hrms-auth
+
+spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4
+#spring.cloud.nacos.config.group=prod
+
+spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+spring.cloud.nacos.config.ext-config[0].group=prod
+spring.cloud.nacos.config.ext-config[0].refresh=true
+
+spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+spring.cloud.nacos.config.ext-config[1].group=prod
+spring.cloud.nacos.config.ext-config[1].refresh=true
+
+spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+spring.cloud.nacos.config.ext-config[2].group=prod
+spring.cloud.nacos.config.ext-config[2].refresh=true
+
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=dq123456
+spring.redis.database=0
+spring.redis.timeout=30000
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java
index 99b57029..453a01e4 100644
--- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java
+++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java
@@ -32,16 +32,16 @@ public class PromptSuccess {
 
     public static final String UPLOAD_FILE_PATH = "//usr//local//nginx//html//admin//headImg//"; // linux图片存放路径
 
-    //public static final String IMAGE_URL_PATH = "https://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径
-    public static final String IMAGE_URL_PATH = "http://8.129.127.185/headImg/"; // 数据库/预加载图片路径
+    public static final String IMAGE_URL_PATH = "https://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径
+    //public static final String IMAGE_URL_PATH = "http://8.129.127.185/headImg/"; // 数据库/预加载图片路径
     //public static final String IMAGE_URL_PATH = "http://47.107.237.129/headImg/"; // 数据库/预加载图片路径
 
     public static final String[] LETTERS = {"A","B","C","D","E"}; // 员工姓名重复时自动加的字母,可再添加
 
     public static final String STATUS_REFUSE = "拒绝";
 
-    //public static final String ENCLOSUREFILE_URL_PATH = "https://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径
-    public static final String ENCLOSUREFILE_URL_PATH = "http://8.129.127.185/enclosureFile/"; // 附件文件存放路径
+    public static final String ENCLOSUREFILE_URL_PATH = "https://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径
+    //public static final String ENCLOSUREFILE_URL_PATH = "http://8.129.127.185/enclosureFile/"; // 附件文件存放路径
     //public static final String ENCLOSUREFILE_URL_PATH = "http://47.107.237.129/enclosureFile/"; // 附件文件存放路径
 
     public static final String FILE_URL_PATH = "//usr//local//nginx//html//admin//enclosureFile//"; // 附件文件存放路径
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgComplianceAssignUser.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgComplianceAssignUser.java
deleted file mode 100644
index f4008bf6..00000000
--- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgComplianceAssignUser.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.daqing.framework.domain.guarantee;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 合规调查记录
- * </p>
- *
- * @author Qyq
- * @since 2020-11-05
- */
-@Data
-@TableName("dg_compliance_assign_user")
-public class DgComplianceAssignUser implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 企业id
-     */
-    private Integer companyId;
-
-    /**
-     * 员工id
-     */
-    private Integer empId;
-
-    /**
-     * 类型（1：第一审批人 2：指派人AB角 3:第一审批人审核 3：经理）
-     */
-    private Integer type;
-
-    /**
-     * 状态(1：待指派 2：审核中  3：审核通过 4：审核不通过 5：驳回)
-     */
-    private Integer status;
-
-    /**
-     * 审核金额
-     */
-    private BigDecimal amount;
-
-    /**
-     * 期限
-     */
-    private String term;
-
-    /**
-     * 补充调查原因
-     */
-    private String remark;
-
-    /**
-     * 审核意见
-     */
-    private String applyContent;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
-}