From 04a7b48223ecdbc002be0b357a398e8d7e973a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Wed, 29 Sep 2021 14:22:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=EF=BC=8C=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayCompanyManagementController.java        | 4 ++--
 .../controller/PayContactsManagementController.java       | 4 ++--
 .../jero/contract/mapper/xml/PayIncomeContractMapper.xml  | 3 ++-
 .../src/main/resources/application-dev.yml                | 8 ++++----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
index 97fa1862..0267c0d0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
@@ -81,7 +81,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	 * @param req
 	 * @return
 	 */
-	@CompanyNameTranslate(fieldId = "id")
+//	@CompanyNameTranslate(fieldId = "id")
 	@RequiresPermissions("company:search")
 	@ApiOperation(value="企业管理-分页列表查询", notes="企业管理-分页列表查询")
 	@GetMapping(value = "/list")
@@ -325,7 +325,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 		 if(Objects.isNull(payCompanyManagementOld)){
 			 return Result.error("企业不存在!");
 		 }
-		 if(Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){
+		 if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){
 			 return Result.error("企业名称不可修改!");
 		 }
 		 payCompanyManagement.setStatus(payCompanyManagementOld.getStatus());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
index 7dd18729..f79c13fe 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
@@ -329,10 +329,10 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		 if(Objects.isNull(payContactsManagementOld)){
 			 return Result.error("联系人不存在！");
 		 }
-		 if(Objects.equals(payContactsManagementOld.getName(),payContactsManagement.getName())){
+		 if(!Objects.equals(payContactsManagementOld.getName(),payContactsManagement.getName())){
 			 return Result.error("姓名不可修改！");
 		 }
-		 if(Objects.equals(payContactsManagementOld.getPhone(),payContactsManagement.getPhone())){
+		 if(!Objects.equals(payContactsManagementOld.getPhone(),payContactsManagement.getPhone())){
 			 return Result.error("手机号不可修改！");
 		 }
 		 try {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
index 8ab72391..60d72f20 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
@@ -33,6 +33,7 @@
             pic.pack,
             pic.pack_year AS packYear,
             pic.status,
+            if(pic.status == 2,1,0) as statusOrder,
             pic.create_by AS createBy,
             pic.create_time AS createTime,
             pic.update_by AS updateBy,
@@ -90,7 +91,7 @@
                 AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%'))
             </if>
         </where>
-        ORDER BY aa.chargeStatus desc,aa.createTime desc
+        ORDER BY aa.chargeStatus desc,aa.statusOrder desc, aa.createTime desc
     </select>
     <select id="getAssociated" resultType="com.jero.contract.vo.ProjectOutput">
         SELECT * FROM (
diff --git a/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot-single-startup/src/main/resources/application-dev.yml
index 88da7252..84c6c3b0 100644
--- a/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -44,9 +44,9 @@ spring:
     job-store-type: jdbc
     initialize-schema: embedded
     #设置自动启动，默认为 true
-    auto-startup: true
+    auto-startup: false
     #启动时更新己存在的Job
-    overwrite-existing-jobs: true
+    overwrite-existing-jobs: false
     properties:
       org:
         quartz:
@@ -148,7 +148,7 @@ spring:
   redis:
     database: 14
     #      host: 121.36.69.172
-    host: 192.168.18.254
+    host: localhost
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -157,7 +157,7 @@ spring:
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
     #    password: hzwlsoft.com
-    password: 123456
+    password:
     #    port: 4780
     port: 6379