修改发短信smsCode

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchTaskServiceImpl.java

@@ -921,7 +921,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
             }
             if(infoCode.indexOf("1") != -1 && StringUtils.isNotBlank(dispatchTaskDto.getResponseUserTel())) { // 下发了短信
                 HashMap<String, String>  params = new HashMap<>();
-                params.put("smsCode","SMS_JCS_0001");
+                params.put("smsCode","SMS_TZS_0001");
                 params.put("mobile",dispatchTaskDto.getResponseUserTel());
                 params.put("address","测试传参短信通知");
                 FeignClientResult<SmsRecordModel> result = Systemctl.smsClient.sendCommonSms(params);

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzsAppService.java

@@ -265,22 +265,26 @@ public class TzsAppService {
 
         List entityList = service.list(wrapper);
         Iterator iterator = entityList.iterator();
+        JSONObject result =new JSONObject();
         if (!isOne) {
             if (!ValidationUtil.isEmpty(entityList)) {
-                while (iterator.hasNext()) {
-                    JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(iterator.next()));
-                    JSONObject result = getFieldList(dto, jsonObject, null);
-                    list.add(result);
+                if (entityList.size()>0) {
+                    while (iterator.hasNext()) {
+                        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(iterator.next()));
+                        result = getFieldList(dto, jsonObject, null);
+                        list.add(result);
+                    }
+
                 }
             }
 
         } else {
-
+            if (entityList.size()>0) {
                 int count = entityList.size();
                 JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(iterator.next()));
-                JSONObject result = getFieldList(dto, jsonObject, count);
+                result = getFieldList(dto, jsonObject, count);
                 list.add(result);
-
+            }
 
 
              }