JiangPengLi 3 месяцев назад
Родитель
Сommit
b4c2b5a875

+ 0 - 5
projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInduMapper.xml

@@ -15,11 +15,6 @@
             i.code,
             i.title,
             i.last_id as lastId,
-            i.create_user_id as createUserId,
-            i.create_time as createTime,
-            i.last_update_user_id as lastUpdateUserId,
-            i.last_update_time as lastUpdateTime,
-            i.logic_delete_flag as logicDeleteFlag,
             s.title as parentTitle
         from sub_indu i left join sub_indu s on i.last_id = s.id where i.logic_delete_flag=0
         <if test="vo!=null and vo.title!=null and vo.title!=''">

+ 1 - 1
projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoServiceImpl.java

@@ -4740,7 +4740,7 @@ public class SubInfoServiceImpl implements SubInfoService {
         query.setMaxResults(1);
         Object result = query.uniqueResult();
         Optional.ofNullable(result).map(o -> (RptCont) o).ifPresent(o -> subInfo.setProgress(o.getContent()));
-        sysTableService.getByKind(SysTableKind.HYFL).stream()
+        subInduService.queryAll(null).stream()
                 .filter(e -> e.getCode().equals(subInfo.getIndusKind()))
                 .findFirst().ifPresent(e-> subInfo.setIndusName(e.getTitle()));
         sysTableService.getByKind(SysTableKind.JSXZ).stream()

+ 1 - 1
projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoApiController.java

@@ -384,7 +384,7 @@ public class SubInfoApiController extends BaseController {
     public Message getById(@RequestBody SubInfoJsonGetVO getVO) {
         Message message = new Message();
         try {
-            SubInfoJsonForm infoVO = subInfoService.getFormById(getVO.getId(), getVO.getNeedSpName());
+            SubInfoVO infoVO = subInfoService.getById(getVO.getId());
             message.setData(infoVO);
         } catch (Exception e) {
             logger.error("", e);