hanfucheng 5 months ago
parent
commit
e22febb9dd

+ 1 - 1
src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/controller/AppXunjianController.java

@@ -25,7 +25,7 @@ public class AppXunjianController {
         return AjaxResult.success(appXunjianService.getXunjianItems(vo));
     }
 
-    @RequestMapping("submitXunjian")
+    @PostMapping("submitXunjian")
     public AjaxResult submitXunjian(@RequestBody AppXunjianVO vo) {
         return appXunjianService.submitXunjian(vo);
     }

+ 7 - 6
src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/service/impl/AppXunjianServiceImpl.java

@@ -4,14 +4,12 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.datascope.annotation.DataScope;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.RemoteConfigService;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
-import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
-import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.enterprise.domain.AppEnterpriseVO;
 import com.sooka.sponest.data.emergency.appmin.util.ImageUtil;
 import com.sooka.sponest.data.emergency.appmin.xunjian.domain.*;
@@ -69,6 +67,9 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
     @Autowired
     private RemoteSystemBaseService remoteSystemBaseService;
 
+    @Autowired
+    private RemoteConfigService remoteConfigService;
+
 
     @Override
     public AjaxResult getXunjianItems(AppXunjianVO vo) {
@@ -133,7 +134,7 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
         //是否有限期整改的
         Boolean haveXQZG = false;//限期整改
         Boolean haveLCLG = false;//立查立改
-        String pictures_local_path = remoteSystemBaseService.configKeyapp("pictures_local_path").get("code").toString();
+        String pictures_local_path = remoteConfigService.remotegetConfigKey("appUrl").getData();
         Date createTime = new Date();
         try {
             //取得登录人信息
@@ -191,7 +192,7 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
                         tBusTrack.setBusTrackId(UUID.fastUUID().toString());
                         tBusTrack.setBusLogId(logId);
                         tBusTrack.setBusInspectionId(busInspectionId);
-                        tBusTrack.setDeptId(sysUser.getSysUser().getDept().getDeptId());
+                        tBusTrack.setDeptId(sysUser.getSysUser().getDeptId());
                         tBusTrack.setUserId(sysUser.getSysUser().getUserId());
                         tBusTrack.setRiskStatus("risk_status_0");
                         tBusTrack.setBusTrackContent(listDataBO.getBusTrackContent());
@@ -260,7 +261,7 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
             tBusDept.setDeptId(sysUser.getSysUser().getDeptId());
             tBusDept.setUserId(sysUser.getUserid());
             tBusDept.setCreateTime(new Date());
-            tBusDept.setDeptType(sysUser.getSysUser().getDept().getDeptType());
+            tBusDept.setDeptType(sysUser.getSysUser().getDepts().get(0).getDeptType());
             tBusDeptMapper.insertTBusDept(tBusDept);
 
             result.put("logId", logId);