，，

src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -9,10 +9,8 @@ import com.unissoft.model.ProcessMain;
 import com.unissoft.model.ProcessSub;
 import com.unissoft.model.SysUserPO;
 import com.unissoft.result.PageParam;
-import com.unissoft.utils.UserUtils;
 import com.unissoft.MyConstant;
 import com.unissoft.dto.ProcessToBeDone;
-import com.unissoft.feign.SystemFeign;
 import com.unissoft.mapper.ProcessAuditMapper;
 import com.unissoft.mapper.ProcessBasisMapper;
 import com.unissoft.mapper.ProcessBasisSonMapper;
@@ -72,9 +70,6 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
     private ProcessBasisService processBasisService;
 
     @Autowired
-    private SystemFeign systemFeign;
-
-    @Autowired
     private RestTemplate restTemplate;
 
 
@@ -268,7 +263,6 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
                 JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
                 BasicsWarehouse ware = JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
-//                BasicsWarehouse ware = systemFeign.getByIdHouse(processAudit.getHouseId());
                 if (null != ware) {
                     processAudit.setHouseName(ware.gethName());
                 }
@@ -276,7 +270,6 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 ResponseEntity<String> userInfos = restTemplate.getForEntity(MyConstant.SYSTEM_USER + processAudit.getApplyPeople(), String.class);
                 JSONObject jsonObjectuser = JSON.parseObject(userInfos.getBody());
                 SysUserPO userInfo = JSONObject.toJavaObject(jsonObjectuser, SysUserPO.class);
-//                SysUserPO userInfo = systemFeign.getUserById(processAudit.getApplyPeople());
                 //赋值
                 if (null != userInfo) {
                     processAudit.setApplyName(userInfo.getPersonnelName());
@@ -534,20 +527,25 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
         if (pageInfo.getTotal() > 0) {
             for (ProcessAudit processAudit : pageInfo.getRecords()) {
-                //根据仓房id获取仓房名称
-                BasicsWarehouse ware = systemFeign.getByIdHouse(processAudit.getHouseId());
+            	//根据仓房id获取仓房名称
+                ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
+                JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
+                BasicsWarehouse ware = JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
                 if (null != ware) {
                     processAudit.setHouseName(ware.gethName());
                 }
                 //获取申请人的信息
-                SysUserPO userInfo = systemFeign.getUserById(processAudit.getApplyPeople());
+                ResponseEntity<String> userInfos = restTemplate.getForEntity(MyConstant.SYSTEM_USER + processAudit.getApplyPeople(), String.class);
+                JSONObject jsonObjectuser = JSON.parseObject(userInfos.getBody());
+                SysUserPO userInfo = JSONObject.toJavaObject(jsonObjectuser, SysUserPO.class);
                 //赋值
                 if (null != userInfo) {
-                    processAudit.setApplyName(userInfo.getuName());
+                    processAudit.setApplyName(userInfo.getPersonnelName());
                     processAudit.setCompanyName(userInfo.getCompanyName());
                     processAudit.setDepartmentName(userInfo.getDepartmentName());
                 }
 
+
             }
         }
 
@@ -586,20 +584,25 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         Page<ProcessAudit> pageInfo = processAuditMapper.selectPage(page, ew);
         if (pageInfo.getTotal() > 0) {
             for (ProcessAudit processAudit : pageInfo.getRecords()) {
-                //根据仓房id获取仓房名称
-                BasicsWarehouse ware = systemFeign.getByIdHouse(processAudit.getHouseId());
+            	//根据仓房id获取仓房名称
+                ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
+                JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
+                BasicsWarehouse ware = JSONObject.toJavaObject(jsonObject, BasicsWarehouse.class);
                 if (null != ware) {
                     processAudit.setHouseName(ware.gethName());
                 }
                 //获取申请人的信息
-                SysUserPO userInfo = systemFeign.getUserById(processAudit.getApplyPeople());
+                ResponseEntity<String> userInfos = restTemplate.getForEntity(MyConstant.SYSTEM_USER + processAudit.getApplyPeople(), String.class);
+                JSONObject jsonObjectuser = JSON.parseObject(userInfos.getBody());
+                SysUserPO userInfo = JSONObject.toJavaObject(jsonObjectuser, SysUserPO.class);
                 //赋值
                 if (null != userInfo) {
-                    processAudit.setApplyName(userInfo.getuName());
+                    processAudit.setApplyName(userInfo.getPersonnelName());
                     processAudit.setCompanyName(userInfo.getCompanyName());
                     processAudit.setDepartmentName(userInfo.getDepartmentName());
                 }
 
+
             }
         }
         return pageInfo;