Merge branch 'dev0124' of http://36.40.66.175:5000/moa/amos-boot-biz into dev0124

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserEmpowerInterceptor.java

@@ -261,11 +261,14 @@ public class UserEmpowerInterceptor implements Interceptor {
           }
       }else{
           List<String> data= stdUserEmpower.getAmosOrgCode();
+          List<String> notdata= stdUserEmpower.getEliminateAmosOrgCode();
+          List<String> wnotdata= stdUserEmpower.getNOeliminateAmosOrgCode();
+
           if( filed!=null&&filed.length>0){
 
               for (int i = 0; i < filed.length; i++) {
                   String sq=" ";
-                  sq= getCondition(filed[i],fileCondition[i],data);
+                  sq= getConditiontd(filed[i],fileCondition[i],data,notdata,wnotdata);
                   sql.add(sq);
               }
           }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -685,7 +685,7 @@ public class JpStationController extends BaseController {
                         map.put("id", jpStation.getSequenceNbr());
                         map.put("name", jpStation.getName());
                         map.put("address", jpStation.getAddress());
-                        map.put("fullhour", format2.format(dayGenerate.getFullhour()));
+                        map.put("fullhour", dayGenerate.getFullhour()!=null?format2.format(dayGenerate.getFullhour()):0);
                         li.add(map);
                         break;
                     }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -578,6 +579,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
                     params.put("smsCode", SMSTEMPCODENO);
                     approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核不通过";
                     FeignClientResult<SmsRecordModel> date= Systemctl.smsClient.sendCommonSms(params);
+                    System.out.println("短信通知============================"+JSON.toJSONString(date));
                 }else{
                     // 1. 更新经销商状态
                     unitInfo.setAuditStatus(2);
@@ -623,6 +625,12 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
 
                     // Privilege.agencyUserClient.unlockUsers(unitInfo.getAdminUserId());
                     approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核通过";
+                    HashMap<String, String> params = new HashMap<>(3);
+                    params.put("code","通过");
+                    params.put("mobile",unitInfo.getAdminPhone());
+                    params.put("smsCode", SMSTEMPCODEYES);
+                    FeignClientResult<SmsRecordModel> date= Systemctl.smsClient.sendCommonSms(params);
+                    System.out.println("短信通知============================"+JSON.toJSONString(date));
 
                 }
             }
@@ -649,11 +657,6 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
 
             this.saveOrUpdate(unitInfo);
 
-            HashMap<String, String> params = new HashMap<>(3);
-            params.put("code","通过");
-            params.put("mobile",unitInfo.getAdminPhone());
-            params.put("smsCode", SMSTEMPCODEYES);
-            FeignClientResult<SmsRecordModel> date= Systemctl.smsClient.sendCommonSms(params);