Merge branch 'develop' into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/MissionServiceImpl.java

@@ -96,8 +96,6 @@ public class MissionServiceImpl extends BaseServiceImpl<ThMissionMapper, ThMissi
         ThMission tm=new ThMission(UpdateOrCreateEnum.CREATE.getCode());
         tm.setCreateUser(ShiroUtils.getUserId());
         tm.setUpdateUser(ShiroUtils.getUserId());
-        log.info("新增mission，租户ID:"+ShiroUtils.getTenantId());
-        tm.setTenantId(ShiroUtils.getTenantId());//xz
         BeanUtils.copyProperties(addThMissionRequest,tm);
 
         //任务名称不能重复
@@ -114,6 +112,7 @@ public class MissionServiceImpl extends BaseServiceImpl<ThMissionMapper, ThMissi
         String code = "XJRW" +CodeUtil.createCodeNo();
         tm.setCode(code);
         tm.setReportStatus(ReportStatusEnum.GENERATE.getCode());
+        tm.setTenantId(ShiroUtils.getTenantId());//xz
         thMissionMapper.insert(tm);
         return tm.getId();
     }