改名：employess改为employees，包括类名，页面名，接口名，参数名

nursing-unit-api/src/main/java/com/nu/modules/employees/EmployeesApi.java

@@ -1,11 +1,8 @@
-package com.nu.modules.employess;
+package com.nu.modules.employees;
 
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Maps;
 import com.nu.modules.IEmployeesInfoApi;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.api.ISysBaseAPI;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,8 +18,8 @@ import java.util.Map;
  * @date 2025-5-22 08:43:05
  */
 @RestController
-@RequestMapping("/api/employessInfo")
+@RequestMapping("/api/employeesInfo")
-public class EmployessApi {
+public class EmployeesApi {
 
     @Lazy
     @Autowired
@@ -33,11 +30,11 @@ public class EmployessApi {
      * @return
      */
     @GetMapping("/getPermissionList")
-    public Result<?> getPermissionList(String employessId){
+    public Result<?> getPermissionList(String employeesId){
-        if (StringUtils.isBlank(employessId)){
+        if (StringUtils.isBlank(employeesId)){
             return Result.error("参数错误");
         }
-        List<Map<String ,Object>> result = employeesInfoApi.getPermissionList(employessId);
+        List<Map<String ,Object>> result = employeesInfoApi.getPermissionList(employeesId);
         return Result.ok(result);
     }
 

nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java

@@ -143,6 +143,6 @@ public class LoginUser {
 	 * 员工id
 	 */
 	@SensitiveField
-	private String employessId;
+	private String employeesId;
 
 }

nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -96,7 +96,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/api/pad/invoicing/getCgdInfoByCgdId", "anon"); //查询采购单列表详细信息（小程序使用）
 //        filterChainDefinitionMap.put("/api/pad/baseInfo/queryPadPageList", "anon"); //查询采购单列表详细信息（小程序使用）
 //        filterChainDefinitionMap.put("/api/pad/invoicing/pdd/**", "anon"); //查询盘点单
-//        filterChainDefinitionMap.put("/api/employessInfo/**", "anon"); //测试员工接口
+//        filterChainDefinitionMap.put("/api/employeesInfo/**", "anon"); //测试员工接口
 //        filterChainDefinitionMap.put("/api/pad/invoicing/**", "anon"); //测试进销存对应的接口
 //        filterChainDefinitionMap.put("/api/pad/qingling/**", "anon"); //测试请领对应的接口
 //        filterChainDefinitionMap.put("/api/pad/care/**", "anon"); //服务指令

nursing-unit-common/src/main/java/com/nu/entity/SysUserEntity.java

@@ -167,7 +167,7 @@ public class SysUserEntity implements Serializable {
     /**
      * 员工id
      */
-    private String employessId;
+    private String employeesId;
 
     @Dict(dicCode = "login_type")
     private String loginType;

nursing-unit-employee/nu-employee-api/nu-employee-local-api/src/main/java/com/nu/modules/IEmployeesInfoApi.java

@@ -6,9 +6,9 @@ import java.util.List;
 import java.util.Map;
 
 public interface IEmployeesInfoApi {
-    List<Map<String ,Object>> getPermissionList(String employessId);
+    List<Map<String ,Object>> getPermissionList(String employeesId);
 
     List<EmployeesInfoEntity> queryEmpList(EmployeesInfoEntity dto);
 
-    void upHeadPath(String employessId, String avatar);
+    void upHeadPath(String employeesId, String avatar);
 }

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/BizEmployeesInfoServiceImpl.java

@@ -2,16 +2,13 @@ package com.nu.modules.employeesInfo.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.nu.entity.EmployeesInfoEntity;
 import com.nu.modules.IEmployeesInfoApi;
 import com.nu.modules.employeesInfo.entity.BizEmployeesInfo;
 import com.nu.modules.employeesInfo.mapper.BizEmployeesInfoMapper;
 import com.nu.modules.employeesInfo.service.IBizEmployeesInfoService;
-import com.nu.modules.employessPermission.entity.NuAppEmployessPermission;
+import com.nu.modules.employeesPermission.entity.NuAppEmployeesPermission;
-import com.nu.modules.employessPermission.service.INuAppEmployessPermissionService;
+import com.nu.modules.employeesPermission.service.INuAppEmployeesPermissionService;
-import com.nu.modules.nuidPermission.entity.NuAppNuidPermission;
-import com.nu.modules.nuidPermission.service.INuAppNuidPermissionService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,13 +31,13 @@ import java.util.stream.Collectors;
 public class BizEmployeesInfoServiceImpl extends ServiceImpl<BizEmployeesInfoMapper, BizEmployeesInfo> implements IBizEmployeesInfoService, IEmployeesInfoApi {
 
     @Autowired
-    private INuAppEmployessPermissionService nuAppEmployessPermissionService;
+    private INuAppEmployeesPermissionService nuAppEmployeesPermissionService;
 
     @Override
-    public List<Map<String, Object>> getPermissionList(String employessId) {
+    public List<Map<String, Object>> getPermissionList(String employeesId) {
-        List<NuAppEmployessPermission> permissionList = nuAppEmployessPermissionService.listByEmployessId(employessId);
+        List<NuAppEmployeesPermission> permissionList = nuAppEmployeesPermissionService.listByEmployeesId(employeesId);
         List<Map<String, String>> originalData = new ArrayList<>();
-        for (NuAppEmployessPermission par : permissionList) {
+        for (NuAppEmployeesPermission par : permissionList) {
             Map<String, String> map = new HashMap<>();
             map.put("nuId", par.getNuId());
             map.put("menuName", par.getMenuName());
@@ -60,9 +57,9 @@ public class BizEmployeesInfoServiceImpl extends ServiceImpl<BizEmployeesInfoMap
     }
 
     @Override
-    public void upHeadPath(String employessId, String avatar) {
+    public void upHeadPath(String employeesId, String avatar) {
         BizEmployeesInfo data = new BizEmployeesInfo();
-        data.setId(employessId);
+        data.setId(employeesId);
         data.setHeadPath(avatar);
         baseMapper.updateById(data);
     }

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/controller/NuAppEmployeesPermissionController.java

@@ -1,10 +1,7 @@
-package com.nu.modules.employessPermission.controller;
+package com.nu.modules.employeesPermission.controller;
 
 import java.util.*;
 import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -18,11 +15,10 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
-import com.nu.modules.employessPermission.entity.NuAppEmployessPermission;
+import com.nu.modules.employeesPermission.entity.NuAppEmployeesPermission;
-import com.nu.modules.employessPermission.service.INuAppEmployessPermissionService;
+import com.nu.modules.employeesPermission.service.INuAppEmployeesPermissionService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,36 +26,28 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.base.service.BaseCommonService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
  /**
- * @Description: nu_app_employess_permission
+ * @Description: nu_app_employees_permission
  * @Author: jeecg-boot
  * @Date:   2026-01-04
  * @Version: V1.0
  */
-@Api(tags="nu_app_employess_permission")
+@Api(tags="nu_app_employees_permission")
 @RestController
-@RequestMapping("/employessPermission/nuAppEmployessPermission")
+@RequestMapping("/employeesPermission/nuAppEmployeesPermission")
 @Slf4j
-public class NuAppEmployessPermissionController extends JeecgController<NuAppEmployessPermission, INuAppEmployessPermissionService> {
+public class NuAppEmployeesPermissionController extends JeecgController<NuAppEmployeesPermission, INuAppEmployeesPermissionService> {
 	@Autowired
-	private INuAppEmployessPermissionService nuAppEmployessPermissionService;
+	private INuAppEmployeesPermissionService nuAppEmployeesPermissionService;
 
 	 @Autowired
 	 private INuAppPermissionService nuAppPermissionService;
@@ -68,52 +56,52 @@ public class NuAppEmployessPermissionController extends JeecgController<NuAppEmp
 	/**
 	 * 分页列表查询
 	 *
-	 * @param nuAppEmployessPermission
+	 * @param nuAppEmployeesPermission
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "nu_app_employess_permission-分页列表查询")
+	//@AutoLog(value = "nu_app_employees_permission-分页列表查询")
-	@ApiOperation(value="nu_app_employess_permission-分页列表查询", notes="nu_app_employess_permission-分页列表查询")
+	@ApiOperation(value="nu_app_employees_permission-分页列表查询", notes="nu_app_employees_permission-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<NuAppEmployessPermission>> queryPageList(NuAppEmployessPermission nuAppEmployessPermission,
+	public Result<IPage<NuAppEmployeesPermission>> queryPageList(NuAppEmployeesPermission nuAppEmployeesPermission,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                                 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+                                                                 HttpServletRequest req) {
-        QueryWrapper<NuAppEmployessPermission> queryWrapper = QueryGenerator.initQueryWrapper(nuAppEmployessPermission, req.getParameterMap());
+        QueryWrapper<NuAppEmployeesPermission> queryWrapper = QueryGenerator.initQueryWrapper(nuAppEmployeesPermission, req.getParameterMap());
-		Page<NuAppEmployessPermission> page = new Page<NuAppEmployessPermission>(pageNo, pageSize);
+		Page<NuAppEmployeesPermission> page = new Page<NuAppEmployeesPermission>(pageNo, pageSize);
-		IPage<NuAppEmployessPermission> pageList = nuAppEmployessPermissionService.page(page, queryWrapper);
+		IPage<NuAppEmployeesPermission> pageList = nuAppEmployeesPermissionService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
 	/**
 	 *   添加
 	 *
-	 * @param nuAppEmployessPermission
+	 * @param nuAppEmployeesPermission
 	 * @return
 	 */
-	@AutoLog(value = "nu_app_employess_permission-添加")
+	@AutoLog(value = "nu_app_employees_permission-添加")
-	@ApiOperation(value="nu_app_employess_permission-添加", notes="nu_app_employess_permission-添加")
+	@ApiOperation(value="nu_app_employees_permission-添加", notes="nu_app_employees_permission-添加")
-	@RequiresPermissions("employessPermission:nu_app_employess_permission:add")
+	@RequiresPermissions("employeesPermission:nu_app_employees_permission:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody NuAppEmployessPermission nuAppEmployessPermission) {
+	public Result<String> add(@RequestBody NuAppEmployeesPermission nuAppEmployeesPermission) {
-		nuAppEmployessPermissionService.save(nuAppEmployessPermission);
+		nuAppEmployeesPermissionService.save(nuAppEmployeesPermission);
 		return Result.OK("添加成功！");
 	}
 	
 	/**
 	 *  编辑
 	 *
-	 * @param nuAppEmployessPermission
+	 * @param nuAppEmployeesPermission
 	 * @return
 	 */
-	@AutoLog(value = "nu_app_employess_permission-编辑")
+	@AutoLog(value = "nu_app_employees_permission-编辑")
-	@ApiOperation(value="nu_app_employess_permission-编辑", notes="nu_app_employess_permission-编辑")
+	@ApiOperation(value="nu_app_employees_permission-编辑", notes="nu_app_employees_permission-编辑")
-	@RequiresPermissions("employessPermission:nu_app_employess_permission:edit")
+	@RequiresPermissions("employeesPermission:nu_app_employees_permission:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody NuAppEmployessPermission nuAppEmployessPermission) {
+	public Result<String> edit(@RequestBody NuAppEmployeesPermission nuAppEmployeesPermission) {
-		nuAppEmployessPermissionService.updateById(nuAppEmployessPermission);
+		nuAppEmployeesPermissionService.updateById(nuAppEmployeesPermission);
 		return Result.OK("编辑成功!");
 	}
 	
@@ -123,12 +111,12 @@ public class NuAppEmployessPermissionController extends JeecgController<NuAppEmp
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "nu_app_employess_permission-通过id删除")
+	@AutoLog(value = "nu_app_employees_permission-通过id删除")
-	@ApiOperation(value="nu_app_employess_permission-通过id删除", notes="nu_app_employess_permission-通过id删除")
+	@ApiOperation(value="nu_app_employees_permission-通过id删除", notes="nu_app_employees_permission-通过id删除")
-	@RequiresPermissions("employessPermission:nu_app_employess_permission:delete")
+	@RequiresPermissions("employeesPermission:nu_app_employees_permission:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		nuAppEmployessPermissionService.removeById(id);
+		nuAppEmployeesPermissionService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -138,12 +126,12 @@ public class NuAppEmployessPermissionController extends JeecgController<NuAppEmp
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "nu_app_employess_permission-批量删除")
+	@AutoLog(value = "nu_app_employees_permission-批量删除")
-	@ApiOperation(value="nu_app_employess_permission-批量删除", notes="nu_app_employess_permission-批量删除")
+	@ApiOperation(value="nu_app_employees_permission-批量删除", notes="nu_app_employees_permission-批量删除")
-	@RequiresPermissions("employessPermission:nu_app_employess_permission:deleteBatch")
+	@RequiresPermissions("employeesPermission:nu_app_employees_permission:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.nuAppEmployessPermissionService.removeByIds(Arrays.asList(ids.split(",")));
+		this.nuAppEmployeesPermissionService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 	
@@ -153,27 +141,27 @@ public class NuAppEmployessPermissionController extends JeecgController<NuAppEmp
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "nu_app_employess_permission-通过id查询")
+	//@AutoLog(value = "nu_app_employees_permission-通过id查询")
-	@ApiOperation(value="nu_app_employess_permission-通过id查询", notes="nu_app_employess_permission-通过id查询")
+	@ApiOperation(value="nu_app_employees_permission-通过id查询", notes="nu_app_employees_permission-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<NuAppEmployessPermission> queryById(@RequestParam(name="id",required=true) String id) {
+	public Result<NuAppEmployeesPermission> queryById(@RequestParam(name="id",required=true) String id) {
-		NuAppEmployessPermission nuAppEmployessPermission = nuAppEmployessPermissionService.getById(id);
+		NuAppEmployeesPermission nuAppEmployeesPermission = nuAppEmployeesPermissionService.getById(id);
-		if(nuAppEmployessPermission==null) {
+		if(nuAppEmployeesPermission==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(nuAppEmployessPermission);
+		return Result.OK(nuAppEmployeesPermission);
 	}
 
     /**
     * 导出excel
     *
     * @param request
-    * @param nuAppEmployessPermission
+    * @param nuAppEmployeesPermission
     */
-    @RequiresPermissions("employessPermission:nu_app_employess_permission:exportXls")
+    @RequiresPermissions("employeesPermission:nu_app_employees_permission:exportXls")
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, NuAppEmployessPermission nuAppEmployessPermission) {
+    public ModelAndView exportXls(HttpServletRequest request, NuAppEmployeesPermission nuAppEmployeesPermission) {
-        return super.exportXls(request, nuAppEmployessPermission, NuAppEmployessPermission.class, "nu_app_employess_permission");
+        return super.exportXls(request, nuAppEmployeesPermission, NuAppEmployeesPermission.class, "nu_app_employees_permission");
     }
 
     /**
@@ -183,10 +171,10 @@ public class NuAppEmployessPermissionController extends JeecgController<NuAppEmp
     * @param response
     * @return
     */
-    @RequiresPermissions("employessPermission:nu_app_employess_permission:importExcel")
+    @RequiresPermissions("employeesPermission:nu_app_employees_permission:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, NuAppEmployessPermission.class);
+        return super.importExcel(request, response, NuAppEmployeesPermission.class);
     }
 	 /**
 	  * 用户角色授权功能，查询菜单权限树
@@ -245,11 +233,11 @@ public class NuAppEmployessPermissionController extends JeecgController<NuAppEmp
 	  *
 	  * @return
 	  */
-	 @RequestMapping(value = "/queryEmployessPermission", method = RequestMethod.GET)
+	 @RequestMapping(value = "/queryEmployeesPermission", method = RequestMethod.GET)
-	 public Result<List<String>> queryEmployessPermission(@RequestParam(name = "employessId", required = true) String employessId) {
+	 public Result<List<String>> queryEmployeesPermission(@RequestParam(name = "employeesId", required = true) String employeesId) {
 		 Result<List<String>> result = new Result<>();
 		 try {
-			 List<NuAppEmployessPermission> list = nuAppEmployessPermissionService.list(new QueryWrapper<NuAppEmployessPermission>().lambda().eq(NuAppEmployessPermission::getRoleId, employessId));
+			 List<NuAppEmployeesPermission> list = nuAppEmployeesPermissionService.list(new QueryWrapper<NuAppEmployeesPermission>().lambda().eq(NuAppEmployeesPermission::getRoleId, employeesId));
 			 result.setResult(list.stream().map(sysRolePermission -> String.valueOf(sysRolePermission.getPermissionId())).collect(Collectors.toList()));
 			 result.setSuccess(true);
 		 } catch (Exception e) {
@@ -272,7 +260,7 @@ public class NuAppEmployessPermissionController extends JeecgController<NuAppEmp
 			 String roleId = json.getString("roleId");
 			 String permissionIds = json.getString("permissionIds");
 			 String lastPermissionIds = json.getString("lastpermissionIds");
-			 this.nuAppEmployessPermissionService.saveRolePermission(roleId, permissionIds, lastPermissionIds,null);
+			 this.nuAppEmployeesPermissionService.saveRolePermission(roleId, permissionIds, lastPermissionIds,null);
 			 //update-begin---author:wangshuai ---date:20220316  for：[VUEN-234]用户管理角色授权添加敏感日志------------
 			 LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 			 baseCommonService.addLog("修改角色ID: "+roleId+" 的权限配置，操作人： " +loginUser.getUsername() ,CommonConstant.LOG_TYPE_2, 2);
@@ -295,7 +283,7 @@ public class NuAppEmployessPermissionController extends JeecgController<NuAppEmp
 		 Result<String> result = new Result<>();
 		 JSONObject objPar = jsonList.getJSONObject(0);
 		 String roleIdAll = objPar.getString("roleId");
-		 nuAppEmployessPermissionService.remove(new QueryWrapper<NuAppEmployessPermission>().lambda().eq(NuAppEmployessPermission::getRoleId, roleIdAll));
+		 nuAppEmployeesPermissionService.remove(new QueryWrapper<NuAppEmployeesPermission>().lambda().eq(NuAppEmployeesPermission::getRoleId, roleIdAll));
 		 try {
 			 for (int i = 0; i < jsonList.size(); i++) {
 				 JSONObject obj = jsonList.getJSONObject(i);
@@ -310,10 +298,10 @@ public class NuAppEmployessPermissionController extends JeecgController<NuAppEmp
 					 for (int j = 0; j < active.size(); j++){
 						 permissionIds = permissionIds+active.getString(j)+",";
 					 }
-					 this.nuAppEmployessPermissionService.saveRolePermission(roleId, permissionIds,lastPermissionIds, nuId);
+					 this.nuAppEmployeesPermissionService.saveRolePermission(roleId, permissionIds,lastPermissionIds, nuId);
 				 //一个扩展功能都没有，则把这个人的nuid和员工id进行删除
 //				 }else{
-//					 nuAppEmployessPermissionService.remove(new QueryWrapper<NuAppEmployessPermission>().lambda().eq(NuAppEmployessPermission::getNuId, nuId).eq(NuAppEmployessPermission::getRoleId, roleId));
+//					 nuAppEmployeesPermissionService.remove(new QueryWrapper<NuAppEmployeesPermission>().lambda().eq(NuAppEmployeesPermission::getNuId, nuId).eq(NuAppEmployeesPermission::getRoleId, roleId));
 				 }
 
 //				 System.out.println("第 " + i + " 个对象:");
@@ -331,7 +319,7 @@ public class NuAppEmployessPermissionController extends JeecgController<NuAppEmp
 //				 String roleId = json.getString("roleId");
 //				 String permissionIds = json.getString("permissionIds");
 //				 String lastPermissionIds = json.getString("lastpermissionIds");
-//				 this.nuAppEmployessPermissionService.saveRolePermission(roleId, permissionIds, lastPermissionIds);
+//				 this.nuAppEmployeesPermissionService.saveRolePermission(roleId, permissionIds, lastPermissionIds);
 //				 //update-begin---author:wangshuai ---date:20220316  for：[VUEN-234]用户管理角色授权添加敏感日志------------
 //				 LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 //				 baseCommonService.addLog("修改角色ID: "+roleId+" 的权限配置，操作人： " +loginUser.getUsername() ,CommonConstant.LOG_TYPE_2, 2);

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/entity/NuAppEmployeesPermission.java

@@ -1,35 +1,29 @@
-package com.nu.modules.employessPermission.entity;
+package com.nu.modules.employeesPermission.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 
 import com.baomidou.mybatisplus.annotation.*;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: nu_app_employess_permission
+ * @Description: nu_app_employees_permission
  * @Author: jeecg-boot
  * @Date:   2026-01-04
  * @Version: V1.0
  */
 @Data
-@TableName("nu_app_employess_permission")
+@TableName("nu_app_employees_permission")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="nu_app_employess_permission对象", description="nu_app_employess_permission")
+@ApiModel(value="nu_app_employees_permission对象", description="nu_app_employees_permission")
-public class NuAppEmployessPermission implements Serializable {
+public class NuAppEmployeesPermission implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**id*/
@@ -69,7 +63,7 @@ public class NuAppEmployessPermission implements Serializable {
     private String menuCode;
 
 
-    public NuAppEmployessPermission(String roleId, String permissionId,String nuId) {
+    public NuAppEmployeesPermission(String roleId, String permissionId, String nuId) {
         this.roleId = roleId;
         this.permissionId = permissionId;
         this.nuId = nuId;

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/mapper/NuAppEmployeesPermissionMapper.java

@@ -0,0 +1,18 @@
+package com.nu.modules.employeesPermission.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.nu.modules.employeesPermission.entity.NuAppEmployeesPermission;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: nu_app_employees_permission
+ * @Author: jeecg-boot
+ * @Date:   2026-01-04
+ * @Version: V1.0
+ */
+public interface NuAppEmployeesPermissionMapper extends BaseMapper<NuAppEmployeesPermission> {
+
+    List<NuAppEmployeesPermission> listByEmployeesId(@Param("roleId") String employeesId);
+}

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/mapper/xml/NuAppEmployeesPermissionMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.nu.modules.employessPermission.mapper.NuAppEmployessPermissionMapper">
+<mapper namespace="com.nu.modules.employeesPermission.mapper.NuAppEmployeesPermissionMapper">
-    <select id="listByEmployessId" resultType="com.nu.modules.employessPermission.entity.NuAppEmployessPermission">
+    <select id="listByEmployeesId" resultType="com.nu.modules.employeesPermission.entity.NuAppEmployeesPermission">
-        select a.*,b.name as menu_name,b.menu_code  from nu_app_employess_permission a
+        select a.*,b.name as menu_name,b.menu_code  from nu_app_employees_permission a
         left join nu_app_permission b on a.permission_id = b.id
         <where>
             <if test="roleId != null and roleId !=''">

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/service/INuAppEmployeesPermissionService.java

@@ -0,0 +1,19 @@
+package com.nu.modules.employeesPermission.service;
+
+import com.nu.modules.employeesPermission.entity.NuAppEmployeesPermission;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Description: nu_app_employees_permission
+ * @Author: jeecg-boot
+ * @Date:   2026-01-04
+ * @Version: V1.0
+ */
+public interface INuAppEmployeesPermissionService extends IService<NuAppEmployeesPermission> {
+
+    void saveRolePermission(String roleId, String permissionIds, String lastPermissionIds,String nuId);
+
+    List<NuAppEmployeesPermission> listByEmployeesId(String employeesId);
+}

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/service/impl/NuAppEmployeesPermissionServiceImpl.java

@@ -1,10 +1,9 @@
-package com.nu.modules.employessPermission.service.impl;
+package com.nu.modules.employeesPermission.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.nu.modules.employessPermission.entity.NuAppEmployessPermission;
+import com.nu.modules.employeesPermission.entity.NuAppEmployeesPermission;
-import com.nu.modules.employessPermission.mapper.NuAppEmployessPermissionMapper;
+import com.nu.modules.employeesPermission.mapper.NuAppEmployeesPermissionMapper;
-import com.nu.modules.employessPermission.service.INuAppEmployessPermissionService;
+import com.nu.modules.employeesPermission.service.INuAppEmployeesPermissionService;
-import com.nu.modules.nuidPermission.entity.NuAppNuidPermission;
 import org.jeecg.common.util.IpUtils;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
@@ -16,13 +15,13 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 /**
- * @Description: nu_app_employess_permission
+ * @Description: nu_app_employees_permission
  * @Author: jeecg-boot
  * @Date:   2026-01-04
  * @Version: V1.0
  */
 @Service
-public class NuAppEmployessPermissionServiceImpl extends ServiceImpl<NuAppEmployessPermissionMapper, NuAppEmployessPermission> implements INuAppEmployessPermissionService {
+public class NuAppEmployeesPermissionServiceImpl extends ServiceImpl<NuAppEmployeesPermissionMapper, NuAppEmployeesPermission> implements INuAppEmployeesPermissionService {
 
     @Override
     public void saveRolePermission(String roleId, String permissionIds,String lastPermissionIds, String nuId) {
@@ -35,12 +34,12 @@ public class NuAppEmployessPermissionServiceImpl extends ServiceImpl<NuAppEmploy
         } catch (Exception e) {
             ip = "127.0.0.1";
         }
-        this.remove(new QueryWrapper<NuAppEmployessPermission>().lambda().eq(NuAppEmployessPermission::getRoleId, roleId).eq(NuAppEmployessPermission::getNuId, nuId));
+        this.remove(new QueryWrapper<NuAppEmployeesPermission>().lambda().eq(NuAppEmployeesPermission::getRoleId, roleId).eq(NuAppEmployeesPermission::getNuId, nuId));
 
         if (oConvertUtils.isNotEmpty(permissionIds)){
-            List<NuAppEmployessPermission> list = new ArrayList<NuAppEmployessPermission>();
+            List<NuAppEmployeesPermission> list = new ArrayList<NuAppEmployeesPermission>();
             for (String permissionId : permissionIds.split(",")){
-                NuAppEmployessPermission rolepms = new NuAppEmployessPermission(roleId, permissionId,nuId);
+                NuAppEmployeesPermission rolepms = new NuAppEmployeesPermission(roleId, permissionId,nuId);
                 rolepms.setOperateDate(new Date());
                 rolepms.setOperateIp(ip);
                 list.add(rolepms);
@@ -52,10 +51,10 @@ public class NuAppEmployessPermissionServiceImpl extends ServiceImpl<NuAppEmploy
 
 //        List<String> add = getDiff(lastPermissionIds,permissionIds,nuId);
 //        if(add!=null && add.size()>0) {
-//            List<NuAppEmployessPermission> list = new ArrayList<NuAppEmployessPermission>();
+//            List<NuAppEmployeesPermission> list = new ArrayList<NuAppEmployeesPermission>();
 //            for (String p : add) {
 //                if(oConvertUtils.isNotEmpty(p)) {
-//                    NuAppEmployessPermission rolepms = new NuAppEmployessPermission(roleId, p);
+//                    NuAppEmployeesPermission rolepms = new NuAppEmployeesPermission(roleId, p);
 //                    rolepms.setOperateDate(new Date());
 //                    rolepms.setOperateIp(ip);
 //                    list.add(rolepms);
@@ -67,14 +66,14 @@ public class NuAppEmployessPermissionServiceImpl extends ServiceImpl<NuAppEmploy
 //        List<String> delete = getDiff(permissionIds,lastPermissionIds,nuId);
 //        if(delete!=null && delete.size()>0) {
 //            for (String permissionId : delete) {
-//                this.remove(new QueryWrapper<NuAppEmployessPermission>().lambda().eq(NuAppEmployessPermission::getRoleId, roleId).eq(NuAppEmployessPermission::getPermissionId, permissionId).eq(NuAppEmployessPermission::getNuId, nuId));
+//                this.remove(new QueryWrapper<NuAppEmployeesPermission>().lambda().eq(NuAppEmployeesPermission::getRoleId, roleId).eq(NuAppEmployeesPermission::getPermissionId, permissionId).eq(NuAppEmployeesPermission::getNuId, nuId));
 //            }
 //        }
     }
 
     @Override
-    public List<NuAppEmployessPermission> listByEmployessId(String employessId) {
+    public List<NuAppEmployeesPermission> listByEmployeesId(String employeesId) {
-        return baseMapper.listByEmployessId(employessId);
+        return baseMapper.listByEmployeesId(employeesId);
     }
 
     /**

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/controller/NuEmployeesAdvisoryInfoController.java

@@ -1,4 +1,4 @@
-package com.nu.modules.employessadvisiory.controller;
+package com.nu.modules.employeesadvisiory.controller;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -14,8 +14,8 @@ import com.nu.modules.employeesmedia.entity.BizEmployeesMedia;
 import com.nu.modules.employeesmedia.service.IBizEmployeesMediaService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import com.nu.modules.employessadvisiory.entity.NuEmployeesAdvisoryInfo;
+import com.nu.modules.employeesadvisiory.entity.NuEmployeesAdvisoryInfo;
-import com.nu.modules.employessadvisiory.service.INuEmployeesAdvisoryInfoService;
+import com.nu.modules.employeesadvisiory.service.INuEmployeesAdvisoryInfoService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/entity/NuEmployeesAdvisoryInfo.java

@@ -1,4 +1,4 @@
-package com.nu.modules.employessadvisiory.entity;
+package com.nu.modules.employeesadvisiory.entity;
 
 import java.io.Serializable;
 

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/mapper/NuEmployeesAdvisoryInfoMapper.java

@@ -1,7 +1,7 @@
-package com.nu.modules.employessadvisiory.mapper;
+package com.nu.modules.employeesadvisiory.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.nu.modules.employessadvisiory.entity.NuEmployeesAdvisoryInfo;
+import com.nu.modules.employeesadvisiory.entity.NuEmployeesAdvisoryInfo;
 
 /**
  * @Description: 员工咨询信息

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.nu.modules.employessadvisiory.mapper.NuEmployeesAdvisoryInfoMapper">
+<mapper namespace="com.nu.modules.employeesadvisiory.mapper.NuEmployeesAdvisoryInfoMapper">
 
 
 </mapper>

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/service/INuEmployeesAdvisoryInfoService.java

@@ -1,6 +1,6 @@
-package com.nu.modules.employessadvisiory.service;
+package com.nu.modules.employeesadvisiory.service;
 
-import com.nu.modules.employessadvisiory.entity.NuEmployeesAdvisoryInfo;
+import com.nu.modules.employeesadvisiory.entity.NuEmployeesAdvisoryInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java

@@ -1,12 +1,12 @@
-package com.nu.modules.employessadvisiory.service.impl;
+package com.nu.modules.employeesadvisiory.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.nu.modules.employeesmedia.entity.BizEmployeesMedia;
 import com.nu.modules.employeesmedia.service.IBizEmployeesMediaService;
-import com.nu.modules.employessadvisiory.entity.NuEmployeesAdvisoryInfo;
+import com.nu.modules.employeesadvisiory.entity.NuEmployeesAdvisoryInfo;
-import com.nu.modules.employessadvisiory.mapper.NuEmployeesAdvisoryInfoMapper;
+import com.nu.modules.employeesadvisiory.mapper.NuEmployeesAdvisoryInfoMapper;
-import com.nu.modules.employessadvisiory.service.INuEmployeesAdvisoryInfoService;
+import com.nu.modules.employeesadvisiory.service.INuEmployeesAdvisoryInfoService;
 import com.nu.modules.mediaasyncerrorlog.entity.MediaAsyncErrorLog;
 import com.nu.modules.mediaasyncerrorlog.service.IMediaAsyncErrorLogService;
 import com.nu.modules.sysconfig.ISysConfigApi;

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/mapper/NuAppEmployessPermissionMapper.java

@@ -1,19 +0,0 @@
-package com.nu.modules.employessPermission.mapper;
-
-import java.util.List;
-
-import com.nu.modules.nuidPermission.entity.NuAppNuidPermission;
-import org.apache.ibatis.annotations.Param;
-import com.nu.modules.employessPermission.entity.NuAppEmployessPermission;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: nu_app_employess_permission
- * @Author: jeecg-boot
- * @Date:   2026-01-04
- * @Version: V1.0
- */
-public interface NuAppEmployessPermissionMapper extends BaseMapper<NuAppEmployessPermission> {
-
-    List<NuAppEmployessPermission> listByEmployessId(@Param("roleId") String employessId);
-}

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/service/INuAppEmployessPermissionService.java

@@ -1,20 +0,0 @@
-package com.nu.modules.employessPermission.service;
-
-import com.nu.modules.employessPermission.entity.NuAppEmployessPermission;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.nu.modules.nuidPermission.entity.NuAppNuidPermission;
-
-import java.util.List;
-
-/**
- * @Description: nu_app_employess_permission
- * @Author: jeecg-boot
- * @Date:   2026-01-04
- * @Version: V1.0
- */
-public interface INuAppEmployessPermissionService extends IService<NuAppEmployessPermission> {
-
-    void saveRolePermission(String roleId, String permissionIds, String lastPermissionIds,String nuId);
-
-    List<NuAppEmployessPermission> listByEmployessId(String employessId);
-}

nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java

@@ -1414,7 +1414,7 @@ public class EmployeesMQListener {
 //                user.setStatus(1);
 //                user.setDelFlag(CommonConstant.DEL_FLAG_0);
 //                user.setCreateTime(new Date());//设置创建时间
-//                user.setEmployessId(employeeId);
+//                user.setEmployeesId(employeeId);
 //                sysUserAPI.save(user);
 
                 //审核通过 - 给员工添加账号
@@ -1425,7 +1425,7 @@ public class EmployeesMQListener {
                 j.put("orgCode",deptInfo.getString("id"));//这个参数要的是机构的id
                 j.put("opeType","employee");
                 j.put("o_c_",deptInfo.getString("code"));
-                j.put("employess_id",employeeId);
+                j.put("employees_id",employeeId);
                 employeesApplyService.initialization(j);
             }else{
                 user.setUsername(employeesInfo.getTel());
@@ -1470,7 +1470,7 @@ public class EmployeesMQListener {
                 user.setStatus(1);
                 user.setDelFlag(CommonConstant.DEL_FLAG_0);
                 user.setCreateTime(new Date());//设置创建时间
-                user.setEmployessId(employeeId);
+                user.setEmployeesId(employeeId);
                 sysUserAPI.save(user);
             }else{
                 user.setUsername(dto.getUsername());
@@ -1495,7 +1495,7 @@ public class EmployeesMQListener {
             if(user!=null){
                 SysUserMQDto sysUserMQDto = new SysUserMQDto();
                 BeanUtils.copyProperties(user, sysUserMQDto);
-                sysUserMQDto.setEmployeeId(user.getEmployessId());
+                sysUserMQDto.setEmployeeId(user.getEmployeesId());
                 rabbitMQUtil.sendToExchange("hldy.employees", "hldy.employeesorg.sysuser.sync", sysUserMQDto);
             }
         }else{
@@ -1546,13 +1546,13 @@ public class EmployeesMQListener {
     public void handleSysUserInfo(SysUserMQDto dto) {
 //        String employeeId = dto.getEmployeeId();
 //        QueryWrapper<SysUserEntity> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.eq("employess_id", employeeId);
+//        queryWrapper.eq("employees_id", employeeId);
         SysUserEntity user = sysUserAPI.getOne(dto.getEmployeeId());
         if(user!=null) {
             SysUserMQDto sysUserMQDto = new SysUserMQDto();
             BeanUtils.copyProperties(user, sysUserMQDto);
             sysUserMQDto.setTargetOrgCode(dto.getTargetOrgCode());
-            sysUserMQDto.setEmployeeId(user.getEmployessId());
+            sysUserMQDto.setEmployeeId(user.getEmployeesId());
             rabbitMQUtil.sendToExchange("hldy.employees", "hldy.employeesorg.sysuser.info", sysUserMQDto);
         }
     }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java

@@ -390,7 +390,7 @@ public class NuInvoicingPddMainServiceImpl extends ServiceImpl<NuInvoicingPddMai
 //        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 //        InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
 //        orderEntity.setId(dto.getId());//指令id
-//        orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
+//        orderEntity.setInitiatorId(sysUser.getEmployeesId());//员工id
 //        Map<String, Object> result = invoicingOrdersApi.beginOrder(orderEntity);
 //        return result;
 //    }
@@ -406,7 +406,7 @@ public class NuInvoicingPddMainServiceImpl extends ServiceImpl<NuInvoicingPddMai
 //        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 //        InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
 //        p_.setId(dto.getId());
-//        p_.setInitiatorId(sysUser.getEmployessId());
+//        p_.setInitiatorId(sysUser.getEmployeesId());
 //        return invoicingOrdersApi.finishOrder(p_);
 //    }
 }

nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java

@@ -91,7 +91,7 @@ public class NuBaseInfoController extends JeecgController<NuBaseInfo, INuBaseInf
         queryWrapper.like(StringUtils.isNotBlank(nuBaseInfo.getNuNameParams()),"a.nu_name",nuBaseInfo.getNuNameParams());
 //        queryWrapper.isNotNull("b.id");
         Page<NuBaseInfo> page = new Page<NuBaseInfo>(pageNo, pageSize);
-        IPage<NuBaseInfo> pageList = nuBaseInfoService.qyPemissionList(page, queryWrapper, nuBaseInfo.getEmployessId());
+        IPage<NuBaseInfo> pageList = nuBaseInfoService.qyPemissionList(page, queryWrapper, nuBaseInfo.getEmployeesId());
         return Result.OK(pageList);
     }
 

nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java

@@ -185,7 +185,7 @@ public class NuBaseInfo implements Serializable {
     private String permissionIds;
     //护理员id
     @TableField(exist = false)
-    private String employessId;
+    private String employeesId;
     @TableField(exist = false)
     private String type;
     @TableField(exist = false)

nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/NuBaseInfoMapper.java

@@ -31,7 +31,7 @@ public interface NuBaseInfoMapper extends BaseMapper<NuBaseInfo> {
 
     List<NuBaseInfoEntity> queryNuAndCameraInfo(@Param("dto") NuBaseInfoEntity dto);
 
-    List<NuBaseInfo> getPermissionList(@Param("employessId") String employessId);
+    List<NuBaseInfo> getPermissionList(@Param("employeesId") String employeesId);
 
-    List<NuBaseInfo> queryReadList(@Param("employessId") String employessId,@Param("username")  String username);
+    List<NuBaseInfo> queryReadList(@Param("employeesId") String employeesId,@Param("username")  String username);
 }

nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml

@@ -77,18 +77,18 @@
 
 
     <select id="getPermissionList" resultType="com.nu.modules.nubaseinfo.entity.NuBaseInfo">
-        select GROUP_CONCAT(permission_id) as permissionIds,nu_id from nu_app_employess_permission where role_id = #{employessId} GROUP BY nu_id
+        select GROUP_CONCAT(permission_id) as permissionIds,nu_id from nu_app_employees_permission where role_id = #{employeesId} GROUP BY nu_id
     </select>
 
     <select id="queryReadList" resultType="com.nu.modules.nubaseinfo.entity.NuBaseInfo">
-        select employee_id as empId,nu_id,'gd' as type , '工单' as typeName from nu_biz_nu_directive_order where START_TIME like concat(DATE_FORMAT(NOW(), '%Y-%m-%d'),'%') and iz_finish = 'N' and employee_id = #{employessId} GROUP BY employee_id,nu_id
+        select employee_id as empId,nu_id,'gd' as type , '工单' as typeName from nu_biz_nu_directive_order where START_TIME like concat(DATE_FORMAT(NOW(), '%Y-%m-%d'),'%') and iz_finish = 'N' and employee_id = #{employeesId} GROUP BY employee_id,nu_id
         union ALL
         select create_by as empId,nu_id,'pdd' as type,'盘点单' as typeName from nu_invoicing_pdd_main where pdd_type = '1' and create_by = #{username} GROUP BY create_by,nu_id
 <!--        union all-->
-<!--        select tj_by as empId,nu_id,'qld' as type,'请领单' as typeName from nu_invoicing_qld_main where status in (1,3,4) and tj_by = #{employessId} GROUP BY tj_by,nu_id-->
+<!--        select tj_by as empId,nu_id,'qld' as type,'请领单' as typeName from nu_invoicing_qld_main where status in (1,3,4) and tj_by = #{employeesId} GROUP BY tj_by,nu_id-->
 <!--        union all-->
 <!--        select create_by as empId,nu_id,'cgd' as type,'采购单' as typeName from nu_invoicing_cgd_main where cgd_type in (0,1) and create_by = #{username} GROUP BY create_by,nu_id-->
 <!--        union ALL-->
-<!--        select fq_by as empId,nu_id,'thd' as type,'退货单' as typeName from nu_invoicing_thd_main where status = '1' and fq_by = #{employessId}  GROUP BY fq_by,nu_id-->
+<!--        select fq_by as empId,nu_id,'thd' as type,'退货单' as typeName from nu_invoicing_thd_main where status = '1' and fq_by = #{employeesId}  GROUP BY fq_by,nu_id-->
     </select>
 </mapper>

nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/INuBaseInfoService.java

@@ -24,5 +24,5 @@ public interface INuBaseInfoService extends IService<NuBaseInfo> {
 
     IPage<NuBaseInfo> qyList(Page<NuBaseInfo> page, QueryWrapper<NuBaseInfo> queryWrapper);
 
-    IPage<NuBaseInfo> qyPemissionList(Page<NuBaseInfo> page, QueryWrapper<NuBaseInfo> queryWrapper,String employessId);
+    IPage<NuBaseInfo> qyPemissionList(Page<NuBaseInfo> page, QueryWrapper<NuBaseInfo> queryWrapper,String employeesId);
 }

nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java

@@ -114,10 +114,10 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
     }
 
     @Override
-    public IPage<NuBaseInfo> qyPemissionList(Page<NuBaseInfo> page, QueryWrapper<NuBaseInfo> queryWrapper,String employessId) {
+    public IPage<NuBaseInfo> qyPemissionList(Page<NuBaseInfo> page, QueryWrapper<NuBaseInfo> queryWrapper,String employeesId) {
         IPage<NuBaseInfo> listPage = baseMapper.qyList(page, queryWrapper);
 
-        List<NuBaseInfo> perList = baseMapper.getPermissionList(employessId);
+        List<NuBaseInfo> perList = baseMapper.getPermissionList(employeesId);
 
         listPage.getRecords().forEach(nuBaseInfo -> {
             perList.forEach(per -> {
@@ -174,10 +174,10 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(loginUser == null){
             loginUser = new LoginUser();
-            loginUser.setEmployessId("1942419556028956674");
+            loginUser.setEmployeesId("1942419556028956674");
             loginUser.setUsername("13069041031");
         }
-        List<NuBaseInfo> readList = baseMapper.queryReadList(loginUser.getEmployessId(), loginUser.getUsername());
+        List<NuBaseInfo> readList = baseMapper.queryReadList(loginUser.getEmployeesId(), loginUser.getUsername());
 
 
         //查找list集合里的nuid等于cameraList集合中nuid的就给list集合赋值

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java

@@ -277,7 +277,7 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
         DirectiveOrderLogEntity log = new DirectiveOrderLogEntity();
         log.setOrderNo(dto.getMainId());//服务指令工单id
         log.setOptType("转单");//操作描述
-        log.setOptBy(sysUser.getEmployessId());//操作人employeeId
+        log.setOptBy(sysUser.getEmployeesId());//操作人employeeId
         log.setOptByName(sysUser.getRealname());//操作人名
         log.setBeforeChange(dto.getBeforeBy());//操作前人
         log.setBeforeChangeName(dto.getBeforeByName());//操作前人名
@@ -316,7 +316,7 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
         DirectiveOrderLogEntity log = new DirectiveOrderLogEntity();
         log.setOrderNo(dto.getMainId());//服务指令工单id
         log.setOptType("协助执行");//操作描述
-        log.setOptBy(sysUser.getEmployessId());//操作人employeeId
+        log.setOptBy(sysUser.getEmployeesId());//操作人employeeId
         log.setOptByName(sysUser.getRealname());//操作人名
         log.setBeforeChange(dto.getBeforeBy());//操作前人
         log.setBeforeChangeName(dto.getBeforeByName());//操作前人名
@@ -329,7 +329,7 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
     public Map<String, Object> addBizLog(DirectiveOrderBizLogEntity directiveOrderBizLogEntity) {
 
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        directiveOrderBizLogEntity.setOptEmpId(sysUser.getEmployessId());
+        directiveOrderBizLogEntity.setOptEmpId(sysUser.getEmployeesId());
         directiveOrderBizLogEntity.setOptTime(new Date());
         DirectiveOrderBizLog directiveOrderBizLog = new DirectiveOrderBizLog();
         BeanUtils.copyProperties(directiveOrderBizLogEntity, directiveOrderBizLog);

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java

@@ -821,7 +821,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
         if (directiveOrder.getTriggerMode().equals("1")) {
             //直接派单给发起人
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            employeeId = sysUser.getEmployessId();
+            employeeId = sysUser.getEmployeesId();
             employeeName = getEmployeeName(employeeId);
         }
 

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/controller/ServiceTagController.java

@@ -204,12 +204,12 @@ public class ServiceTagController extends JeecgController<ServiceTag, IServiceTa
     }
 
 
-    @GetMapping(value = "/getEmployessServiceTags")
+    @GetMapping(value = "/getEmployeesServiceTags")
-    public Result<List<ServiceTag>> getEmployessServiceTags(ServiceTag serviceTag) {
+    public Result<List<ServiceTag>> getEmployeesServiceTags(ServiceTag serviceTag) {
         if(StringUtils.isEmpty(serviceTag.getEmployeesId())){
             return Result.error("员工id不能为空");
         }
-        List<ServiceTag> pageList = serviceTagService.getEmployessServiceTags(serviceTag);
+        List<ServiceTag> pageList = serviceTagService.getEmployeesServiceTags(serviceTag);
         return Result.OK(pageList);
     }
 }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/ServiceTagMapper.java

@@ -26,5 +26,5 @@ public interface ServiceTagMapper extends BaseMapper<ServiceTag> {
 
     IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, ServiceTag serviceTag);
 
-    List<ServiceTag> getEmployessServiceTags(ServiceTag serviceTag);
+    List<ServiceTag> getEmployeesServiceTags(ServiceTag serviceTag);
 }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml

@@ -201,7 +201,7 @@
     </select>
 
 
-    <select id="getEmployessServiceTags" resultType="com.nu.modules.config.servicetag.entity.ServiceTag">
+    <select id="getEmployeesServiceTags" resultType="com.nu.modules.config.servicetag.entity.ServiceTag">
         select a.id, b.tag_name, b.description, a.create_time, b.id as employeesTagsId
         from nu_biz_employees_servcie_tags a
                  LEFT JOIN nu_service_tag b on a.tags_id = b.id

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/IServiceTagService.java

@@ -27,5 +27,5 @@ public interface IServiceTagService extends IService<ServiceTag> {
 
     IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, ServiceTag queryWrapper);
 
-    List<ServiceTag> getEmployessServiceTags(ServiceTag serviceTag);
+    List<ServiceTag> getEmployeesServiceTags(ServiceTag serviceTag);
 }

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/impl/ServiceTagServiceImpl.java

@@ -68,8 +68,8 @@ public class ServiceTagServiceImpl extends ServiceImpl<ServiceTagMapper, Service
     }
 
     @Override
-    public List<ServiceTag> getEmployessServiceTags(ServiceTag serviceTag) {
+    public List<ServiceTag> getEmployeesServiceTags(ServiceTag serviceTag) {
-        return baseMapper.getEmployessServiceTags(serviceTag);
+        return baseMapper.getEmployeesServiceTags(serviceTag);
     }
 
 }

nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -144,7 +144,7 @@ public class LoginController {
 		JSONObject deptInfo = sysBaseAPI.getDeptInfo();
 		String orgCode = deptInfo.getString("code");
 		SysUserMQDto dto = new SysUserMQDto();
-		dto.setEmployeeId(sysUser.getEmployessId());
+		dto.setEmployeeId(sysUser.getEmployeesId());
 		dto.setOrgCode(orgCode);
 		rabbitMQUtil.sendToExchange("hldy.employees", "hldy.employeesorg.lastlogin", dto);
 

nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -300,11 +300,11 @@ public class SysUserController {
 
 
     @RequiresPermissions("system:user:queryById")
-    @RequestMapping(value = "/queryByEmployessId", method = RequestMethod.GET)
+    @RequestMapping(value = "/queryByEmployeesId", method = RequestMethod.GET)
-    public Result<SysUser> queryByEmployessId(@RequestParam(name = "employessId", required = true) String employessId) {
+    public Result<SysUser> queryByEmployeesId(@RequestParam(name = "employeesId", required = true) String employeesId) {
         Result<SysUser> result = new Result<SysUser>();
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("employess_id", employessId);
+        queryWrapper.eq("employees_id", employeesId);
         SysUser sysUser = sysUserService.getOne(queryWrapper);
         result.setResult(sysUser);
         result.setSuccess(true);
@@ -1749,7 +1749,7 @@ public class SysUserController {
         sysUserService.updateById(sysUserEditAvatar);
 
         //修改员工表头像
-        employeesInfoApi.upHeadPath(sysUser.getEmployessId(),sysUser.getAvatar());
+        employeesInfoApi.upHeadPath(sysUser.getEmployeesId(),sysUser.getAvatar());
 
         return Result.ok("更新个人信息成功");
     }

nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -170,7 +170,7 @@ public class SysUser implements Serializable {
     /**
      * 员工id
      */
-    private String employessId;
+    private String employeesId;
 
     @Dict(dicCode = "login_type")
     private String loginType;

nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserApiImpl.java

@@ -108,7 +108,7 @@ public class SysUserApiImpl implements ISysUserAPI {
     @Override
     public SysUserEntity getOne(String employeeId) {
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("employess_id", employeeId);
+        queryWrapper.eq("employees_id", employeeId);
         SysUser user = service.getOne(queryWrapper);
         SysUserEntity sysUserEntity = new SysUserEntity();
         if (user != null) {
@@ -206,7 +206,7 @@ public class SysUserApiImpl implements ISysUserAPI {
     @Override
     public List<SysUserEntity> queryByEmployees(String employeeIds) {
         QueryWrapper<SysUser> qw = new QueryWrapper<>();
-        qw.in("employess_id",employeeIds.split(","));
+        qw.in("employees_id",employeeIds.split(","));
         List<SysUser> list = sysUserService.list(qw);
         return BeanUtil.copyToList(list,SysUserEntity.class);
     }

nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -2115,7 +2115,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public void modifyEmpOnline(SysUser sysUser, String izOnline){
-        String employeeId = sysUser.getEmployessId();
+        String employeeId = sysUser.getEmployeesId();
         if(employeeId!=null&&!employeeId.equals("")){
             userMapper.modifyEmpOnline(employeeId,izOnline);
         }