yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessCcController.java

@@ -103,7 +103,7 @@ public class BpmProcessCcController {
                     .collect(Collectors.joining("、")));
             // 设置公司名称
             data.setCompanyName(data.getCompanyDeptId().stream()
-                    .map(item -> deptMap.get(item) != null ? deptMap.get(item).getName() : "")
+                    .map(item -> deptMap.get(item).getName())
                     .collect(Collectors.joining("、")));
         });
         return success(respVOPageResult);

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java

@@ -233,9 +233,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
 
         // 判断搜索条件是否选择用户
         List<Long> userIds = null;
-        if (pageVO.getUserId() != null) {
-            userIds = Collections.singletonList(pageVO.getUserId());
-        }else if (pageVO.getDeptId() != null) {
+        if (pageVO.getDeptId() != null) {
 
             List<AdminUserRespDTO> users = adminUserApi.getUserByDeptIdAll(pageVO.getDeptId()).getCheckedData();
             userIds = users.stream().map(AdminUserRespDTO::getId).collect(Collectors.toList());

yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAProcureMapper.xml

@@ -30,7 +30,7 @@
         AND a.pay_flag = 0
         AND a.deleted = 0
     	<if	test="type != null">
-			AND (a.procure_type = #{type} or a.procure_type = 3)
+			AND a.procure_type = #{type}
 		</if>
     </select>
 </mapper>

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java

@@ -334,8 +334,6 @@ public class DeptServiceImpl implements DeptService {
 
         return deptMapper.selectList(new LambdaQueryWrapperX<DeptDO>()
                 .eq(DeptDO::getType, DeptTypeEnum.COMPANY.getValue())
-                .or()
-                .eq(DeptDO::getType, DeptTypeEnum.HEAD_COMPANY.getValue())
                 .eq(DeptDO::getVirtuallyStatus, 0)
                 .eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus()));
     }

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.smartfactory.service.factoryinfo;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.enums.DeptTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.ip.core.Area;
@@ -72,7 +71,6 @@ public class FactoryInfoServiceImpl implements FactoryInfoService {
             deptRespDTO.setParentId(169L);  //这里设置上级部门为 生产部
             deptRespDTO.setLeaderUserId(createReqVO.getLeaderUserId());
             deptRespDTO.setStatus(CommonStatusEnum.ENABLE.getStatus());
-            deptRespDTO.setType(DeptTypeEnum.PRODUCTION_DEPT.getValue());
             deptRespDTO.setVirtuallyStatus(0);
             deptApi.createDept(deptRespDTO);
         }