冲突处理

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteOrgService.java

@@ -37,7 +37,5 @@ public interface RemoteOrgService {
     @PostMapping("/org/sync/batch")
     R<Boolean> batchSaveSyncOrg(@RequestBody List<SysOrg> orgList, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
-    @GetMapping("/org/{orgId}")
-    SysOrg selectSysOrgById(@PathVariable("orgId") Long orgId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteOrgFallbackFactory.java

@@ -60,8 +60,6 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
                 return null;
             }
 
-            @Override
-            public SysOrg selectSysOrgById(Long orgId, String source) {return null;}
 
 
         };

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/SysLearningMaterialsServiceImpl.java

@@ -60,7 +60,7 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
     }
 
     private void dealParentOrgId(SysLearningMaterialsPageDto sysLearningMaterials) {
-        SysOrg sysOrg = remoteOrgService.selectSysOrgById(sysLearningMaterials.getOrgId(), SecurityConstants.INNER);
+        SysOrg sysOrg = remoteOrgService.selectSysOrgById(sysLearningMaterials.getOrgId(), SecurityConstants.INNER).getData();
         if (sysOrg == null || ObjectUtil.isEmpty(sysOrg.getPath())) {
             return;
         }
@@ -106,7 +106,7 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
         sysLearningMaterials.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         sysLearningMaterials.setUpdateTime(DateUtils.getNowDate());
         sysLearningMaterials.setIsOpen(0);
-        final SysOrg sysOrg = remoteOrgService.selectSysOrgById(sysLearningMaterials.getOrgId(), SecurityConstants.INNER);
+        final SysOrg sysOrg = remoteOrgService.selectSysOrgById(sysLearningMaterials.getOrgId(), SecurityConstants.INNER).getData();
         if (sysOrg != null) {
             sysLearningMaterials.setOrgName(sysOrg.getName());
             sysLearningMaterials.setOrgPath(sysOrg.getPath());

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeSetServiceImpl.java

@@ -17,17 +17,10 @@ import com.xunmei.system.domain.SysWorkTime;
 import com.xunmei.system.domain.SysWorkTimeSetDayofweek;
 import com.xunmei.system.mapper.SysWorkTimeMapper;
 import com.xunmei.system.mapper.SysWorkTimeSetDayofweekMapper;
-<<<<<<< .mine
 import com.xunmei.common.core.util.BeanHelper;
-=======
 import com.xunmei.system.util.StreamHelper;
->>>>>>> .theirs
 import com.xunmei.common.core.util.DateHelper;
-<<<<<<< .mine
 
-=======
-import com.xunmei.util.DateHelper;
->>>>>>> .theirs
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,7 +45,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper, SysWorkTimeSet> implements ISysWorkTimeSetService {
     @Autowired
-    private SysWorkTimeSetMapper sysWorkTimeSetMapper;
+    private SysWorkTimeSetMapper  sysWorkTimeSetMapper;
     @Autowired
     private ISysOrgService orgService;
     @Autowired