1、会员开通失败问题修复

2、合同查询失败问题修改
3、轮播图排序问题修复

han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java

@@ -98,12 +98,12 @@ public class MpWxPayService {
         request.setDetail(productName);       //商品详情
         request.setTotalFee(price);           //总金额|分计
         request.setSpbillCreateIp(clientIp);  //终端IP
-        request.setNotifyUrl("https://admin.teyizhao.com/employ-api/employ/vip/payNotify");//设置回调路径
+        request.setNotifyUrl("https://www.teyizhao.com/employ-api/employ/vip/payNotify");//设置回调路径
         request.setProductId(productId);      //商品id
         request.setOpenid(openId);            //JSAPI OPENID
         if (dev){
             request.setTotalFee(price);
-            request.setNotifyUrl("https://admin.teyizhao.com/employ-api/employ/vip/payNotify");
+            request.setNotifyUrl("https://www.teyizhao.com/employ-api/employ/vip/payNotify");
         }
         try {
             Object order = wxPayService.createOrder(request);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java

@@ -139,13 +139,18 @@ public class CommonApiServiceImpl implements CommonApiService {
     //获取工种列表带分页
     @Override
     public Result<?> queryJobTypeList(PageBean pageBean) {
+        try{
+            Page<EmployJobType> page = new Page<EmployJobType>(pageBean.getPageNo(), pageBean.getPageSize());
+            Page<EmployJobType> pageList = employJobTypeService
+                    .lambdaQuery()
+                    .orderByAsc(EmployJobType::getTypeOrder)
+                    .page(page);
 
-        Page<EmployJobType> page = new Page<EmployJobType>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<EmployJobType> pageList = employJobTypeService
-                .lambdaQuery()
-                .page(page);
-
-        return Result.OK("工种列表", pageList);
+            return Result.OK("工种列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("工种列表查询失败");
+        }
     }
 
     //获取工作性质带分页

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ContractServiceImpl.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.apiService.impl;
 import com.aliyuncs.utils.IOUtils;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang.StringUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -22,6 +23,7 @@ import org.jeecg.modules.employContract.service.IEmployContractService;
 import org.jeecg.modules.employContractTemplate.entity.EmployContractTemplate;
 import org.jeecg.modules.employContractTemplate.service.IEmployContractTemplateService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -75,46 +77,52 @@ public class ContractServiceImpl implements ContractService {
             if("0".equals(role)){
                 //用户为个人
                 query.eq(EmployContract::getEmployeeId, hanHaiMember.getId());
-                //签署状态: 0查询全部、1待我签署、2他人签署、3签约完成
-                switch (status){
-                    case "0":
-                        //查询全部
-                        break;
-                    case "1":
-                        //未签署
-                        employContract.setEmployeeStatus(0);
-                        break;
-                    case "2":
-                        //他人未签署
-                        employContract.setBossStatus(0);
-                        break;
-                    case "3":
-                        //签署完成
-                        employContract.setEmployeeStatus(1);
-                        employContract.setBossStatus(1);
-                        break;
+                if(StringUtils.isNotEmpty(status)){
+                    //签署状态: 0查询全部、1待我签署、2他人签署、3签约完成
+                    switch (status){
+                        case "0":
+                            //查询全部
+                            break;
+                        case "1":
+                            //未签署
+                            employContract.setEmployeeStatus(0);
+                            break;
+                        case "2":
+                            //他人未签署
+                            employContract.setBossStatus(0);
+                            break;
+                        case "3":
+                            //签署完成
+                            employContract.setEmployeeStatus(1);
+                            employContract.setBossStatus(1);
+                            break;
+                    }
                 }
+
+
             }else if("1".equals(role)){
                 //用户为企业
                 query.eq(EmployContract::getBossId, hanHaiMember.getId());
-                //签署状态: 0查询全部、1待我签署、2他人签署、3签约完成
-                switch (status){
-                    case "0":
-                        //查询全部
-                        break;
-                    case "1":
-                        //未签署
-                        employContract.setBossStatus(0);
-                        break;
-                    case "2":
-                        //他人未签署
-                        employContract.setEmployeeStatus(0);
-                        break;
-                    case "3":
-                        //签署完成
-                        employContract.setBossStatus(1);
-                        employContract.setEmployeeStatus(1);
-                        break;
+                if(StringUtils.isNotEmpty(status)){
+                    //签署状态: 0查询全部、1待我签署、2他人签署、3签约完成
+                    switch (status){
+                        case "0":
+                            //查询全部
+                            break;
+                        case "1":
+                            //未签署
+                            employContract.setBossStatus(0);
+                            break;
+                        case "2":
+                            //他人未签署
+                            employContract.setEmployeeStatus(0);
+                            break;
+                        case "3":
+                            //签署完成
+                            employContract.setBossStatus(1);
+                            employContract.setEmployeeStatus(1);
+                            break;
+                    }
                 }
             }else {
                 return Result.error("角色类型输入错误，电子合同列表查询失败");