Merge branch 'feature_v1.0' into develop

# Conflicts:
#	tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/NoticeWeChatMiniProgramService.java

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/NoticeWeChatMiniProgramService.java

@@ -41,7 +41,7 @@ public class NoticeWeChatMiniProgramService {
         jsonObject.put("tenantId", inspection.getTenantId());
         jsonObject.put("deptId", inspection.getDeptId());
         jsonObject.put("inspectionId", inspection.getId());
-        jsonObject.put("questionName", questionType.getName().toString());
+        jsonObject.put("questionName", inspection.getName());
         jsonObject.put("questionDesc", questionType.getContent());
         jsonObject.put("createTime", DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
 

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java

@@ -444,13 +444,18 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 vo.setName(inspection.getName());
                 vo.setExecutionStartTime(inspection.getExecutionStartTime());
                 Channel channel = channelMapper.selectById(inspection.getChannelId());
-                if (null != channel) {
+                if (ObjectUtil.isNotNull(channel)) {
                     if (StringUtils.isEmpty(channel.getCode())) {
                         throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
                     }
                     vo.setCode(channel.getCode());
                 }
-
+                Leg leg = legMapper.selectById(inspection.getLegId());
+                if(ObjectUtil.isNotNull(leg)){
+                    if(StringUtils.isNotEmpty(leg.getLegRange())){
+                        vo.setLegRange(leg.getLegRange());
+                    }
+                }
             }
             //问题类型
             if (StringUtils.isEmpty(t.getQuestionId())) {

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WxServiceImpl.java

@@ -145,6 +145,7 @@ public class WxServiceImpl implements IWxService {
      */
     @Override
     public JsonResult sendMessage(WxMessageRequest wxMessageRequest) {
+        wxMessageRequest.setQuestionDesc("发现疑似问题待处理，请及时查看。");
         JsonResult result = this.check(wxMessageRequest);
         if(result.getCode() != 0){
             //正常返回,信息提示
@@ -261,7 +262,7 @@ public class WxServiceImpl implements IWxService {
                 .eq(User::getDeptId, wxMessageRequest.getDeptId())
                 .eq(User::getStatus, 1));
         if(CollectionUtil.isEmpty(users) || users.size() == 0){
-            return JsonResult.error("此租户下没有用户");
+            return JsonResult.error("此部门下没有用户");
         }
         return JsonResult.success(users);
     }