Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.2

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

@@ -12,6 +12,7 @@ import com.xunmei.system.api.domain.SysOrgExtend;
 import com.xunmei.system.api.factory.RemoteOrgFallbackFactory;
 import com.xunmei.system.api.vo.SysOrgVO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -145,7 +146,7 @@ public interface RemoteOrgService {
 //    List<SysOrg> selectParentHs(@RequestBody List<Long> orgList, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     // 此接口需要获取当前登陆人信息，不可异步
-    @GetMapping("/dept/selectOrgTreeReq")
-    OrgTreeResp getOrgTreeResp(@RequestParam("orgId") Long orgId,@RequestParam("checkSub") Boolean checkSub);
+    @PostMapping("/dept/selectOrgTreeReq")
+    R<OrgTreeResp> getOrgTreeResp(@RequestBody OrgTreeReq orgTreeReq);
 
 }

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

@@ -161,7 +161,8 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
             }
 
             @Override
-            public OrgTreeResp getOrgTreeResp(Long orgId, Boolean checkSub) {
+            public R<OrgTreeResp>  getOrgTreeResp(OrgTreeReq orgTreeReq) {
+                log.error("获取机构树失败:{}", throwable.getMessage());
                 return null;
             }
         };

soc-common/soc-common-security/src/main/java/com/xunmei/common/security/config/WebMvcConfig.java

@@ -45,7 +45,7 @@ public class WebMvcConfig implements WebMvcConfigurer, ApplicationContextAware {
 
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-       /* final AbstractJackson2HttpMessageConverter httpMessageConverter = applicationContext.getBean(AbstractJackson2HttpMessageConverter.class);
+        final AbstractJackson2HttpMessageConverter httpMessageConverter = applicationContext.getBean(AbstractJackson2HttpMessageConverter.class);
         final ObjectMapper objectMapper = httpMessageConverter.getObjectMapper();
         SimpleModule simpleModule = new SimpleModule();
 
@@ -55,6 +55,6 @@ public class WebMvcConfig implements WebMvcConfigurer, ApplicationContextAware {
 
         objectMapper.configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true);
         objectMapper.registerModule(simpleModule);
-        httpMessageConverter.setObjectMapper(objectMapper);*/
+        httpMessageConverter.setObjectMapper(objectMapper);
     }
 }

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

@@ -13,6 +13,7 @@ import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.OrgTreeReq;
 import com.xunmei.common.core.domain.OrgTreeResp;
+import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.domain.edu.domain.SysLearningMaterials;
 import com.xunmei.common.core.domain.edu.dto.SysLearningMaterialsFileListPageDto;
 import com.xunmei.common.core.domain.edu.dto.SysLearningMaterialsInsertDto;
@@ -65,13 +66,15 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
        /* final List<Long> list = dealParentOrgId(request, sysOrg);
         boolean isTopOrg = ObjectUtil.equal(sysOrg.getParentId(), TOP_ORG_PARENT_ID);
         list.remove(request.getOrgId());
-        request.setOrgIdList(list);
-        request.setUserId(SecurityUtils.getUserId());*/
+        request.setOrgIdList(list);*/
+        request.setUserId(SecurityUtils.getUserId());
         //获取数据 默认查询当前及上级机构公开,当前用户创建的的数据
         OrgTreeReq orgTreeReq = new OrgTreeReq(request.getOrgId(), request.getCheckSub());
 
 
-        OrgTreeResp orgTreeResp = remoteOrgService.getOrgTreeResp(request.getOrgId(),request.getCheckSub());
+        R<OrgTreeResp> orgTreeRespR = RemoteCallHandlerExecutor.executeRemoteCall(() ->
+                remoteOrgService.getOrgTreeResp(orgTreeReq), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+        OrgTreeResp orgTreeResp = orgTreeRespR.getData();
 
 
         request.setOrgId(orgTreeResp.getOrgId());

soc-modules/soc-modules-core/src/main/resources/mapper/edu/SysLearningMaterialsMapper.xml

@@ -112,17 +112,14 @@
         inner join sys_user u on u.id=m.create_by
         where m.deleted = 0
         and k.deleted = 0
-        and (m.create_by=#{request.userId} or m.is_open = 1)
+        and m.create_by=#{request.userId}
         <include refid="pageRequest"/>
-        <if test="request.checkSub==true">
-            or ( m.org_path like concat(#{request.orgPath},'%') and m.is_open =
-            1 <!--and m.org_path !=#{request.orgPath}-->
-            <include refid="pageRequest"/>)
-        </if>
-        <if test="request.checkSub==false">
-            and m.org_id=#{request.orgId}
+        <if test="request.orgId !=null">
+           and m.org_id=#{request.orgId}
         </if>
+
         <if test="request.orgIdList != null and request.orgIdList.size>0">
+            <!-- 查询父机构公开资料-->
             or ( m.org_id in
             <foreach collection="request.orgIdList" item="item" open="(" separator="," close=")">
                 #{item}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeptController.java

@@ -341,9 +341,8 @@ public class SysDeptController extends BaseController {
 
 
     @ApiOperation(value = "获取机构查询参数")
-    @GetMapping("/selectOrgTreeReq")
-    @InnerAuth
-    OrgTreeResp getOrgTreeResp( Long orgId,Boolean checkSub){
-        return orgService.getOrgTreeReq(null);
+    @PostMapping("/selectOrgTreeReq")
+    R<OrgTreeResp>  getOrgTreeResp(@RequestBody OrgTreeReq orgTreeReq){
+        return R.ok(orgService.getOrgTreeReq(orgTreeReq));
     }
 }

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

@@ -466,7 +466,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             return resp;
         }
         //不下穿查询：
-        if (queryOrgPath.startsWith(curOrgPath)){
+        if (curOrgPath.startsWith(queryOrgPath)){
             //查询父机构: 返回当前机构至查询机构之间的所有机构id
             List<Long> list = Arrays.stream(queryOrgPath.split("-")).map(Long::valueOf).collect(Collectors.toList());
             resp.setOrgIdList(list);