根据公司ID，查询该公司下的所有用户。

- 将男性员工的性别标识从 0 修改为 1
- 将女性员工的性别标识从 1 修改为 2

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAExpensesController.java

@@ -65,7 +65,6 @@ public class BpmOAExpensesController {
     @Operation(summary = "获得生产开支申请分页")
     @DataPermission(enable = false)
     public CommonResult<PageResult<BpmOAExpensesPageRespVO>> getExpensesPage(BpmOAExpensesPageReqVO pageReqVO) {
-
         PageResult<BpmOAExpensesPageRespVO> respVO = expensesService.getExpensesPage(pageReqVO);
         return success(respVO);
     }
@@ -107,4 +106,4 @@ public class BpmOAExpensesController {
         expensesService.oneClickPayment(month);
         return success(true);
     }
-}
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/loan/LoanController.java

@@ -91,4 +91,4 @@ public class LoanController {
 
         return success(result);
     }
-}
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.controller.admin.user;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -471,4 +472,25 @@ public class UserController {
 
         return postName;
     }
+
+    @GetMapping("/getUserBycompanyId")
+    @Operation(summary = "根据公司ID（ 此公司ID，需要查询到对应的部门ID）,查询该部门下的用户")
+    @Parameter(name = "companyId", description = "公司ID", required = true, example = "10000083")
+    @DataPermission(enable = false)
+    public CommonResult<List<UserSimpleRespVO>> getUserBycompanyId(@RequestParam("companyId") Long companyId) {
+        //1 = 113  中鼐智能科技（江西）有限公司,  10000083 = 136  世瑞华科技(深圳)有限公司     10000061 = 166 中鼐智能科技(江西)有限公司(高安)
+        if(companyId == 1L) {
+            companyId = 113L;
+        }else if(companyId == 10000083L)  {
+            companyId = 136L;
+        }else if(companyId == 10000061L ){
+            companyId = 166L ;
+        }
+        List<DeptDO> deptDOS = deptService.getChildDept(companyId);
+        if(deptDOS == null){
+            throw new ServiceException(500, "公司ID，未查询到数据");
+        }
+        List<AdminUserDO> userDOS = userService.getUserListByDeptIds(convertList(deptDOS, DeptDO::getId), CommonStatusEnum.ENABLE.getStatus());
+        return success(BeanUtils.toBean(userDOS, UserSimpleRespVO.class));
+    }
 }

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffServiceImpl.java

@@ -139,8 +139,8 @@ public class StaffServiceImpl implements StaffService {
         });
 
         vo.setTotal(dos.size());
-        vo.setMaleTotal((int) dos.stream().filter(a -> a.getSex() != null && a.getSex() == 0).count());
+        vo.setMaleTotal((int) dos.stream().filter(a -> a.getSex() != null && a.getSex() == 1).count());
-        vo.setFemaleTotal((int) dos.stream().filter(a -> a.getSex() != null && a.getSex() == 1).count());
+        vo.setFemaleTotal((int) dos.stream().filter(a -> a.getSex() != null && a.getSex() == 2).count());
         vo.setStaffInfos(dos);
         return vo;
     }