企业端，个人信息修改

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());

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 {

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 (