|
@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.util.ArrayUtil;
|
|
import cn.hutool.core.util.ArrayUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
-import com.alibaba.fastjson.JSONException;
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.aspose.cells.*;
|
|
import com.aspose.cells.*;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
@@ -358,8 +357,8 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
|
|
JSONObject dutyDepartOrg = orgMap.get(dutyDepartName);
|
|
JSONObject dutyDepartOrg = orgMap.get(dutyDepartName);
|
|
if(ObjectUtil.isNotEmpty(dutyDepartName) && ObjectUtil.isNotNull(dutyDepartOrg)) {
|
|
if(ObjectUtil.isNotEmpty(dutyDepartName) && ObjectUtil.isNotNull(dutyDepartOrg)) {
|
|
machine.setDutydeptid(dutyDepartOrg.getString("ID"));
|
|
machine.setDutydeptid(dutyDepartOrg.getString("ID"));
|
|
- machine.setFirstdutydeptid(departOrg.getString("PID"));
|
|
|
|
- machine.setFirstdutydeptname(departOrg.getString("pshortName"));
|
|
|
|
|
|
+ machine.setFirstdutydeptid(dutyDepartOrg.getString("PID"));
|
|
|
|
+ machine.setFirstdutydeptname(dutyDepartOrg.getString("pshortName"));
|
|
}
|
|
}
|
|
machine.setDutydeptname(dutyDepartName);
|
|
machine.setDutydeptname(dutyDepartName);
|
|
|
|
|