Merge remote-tracking branch 'origin/master'

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/ESignServiceImpl.java

@@ -700,7 +700,7 @@ public class ESignServiceImpl implements IESignService {
 
     @Override
     public IPage<ContractSignVO> queryUserSignContractList(ContractSignDTO contractSignDTO) {
-        Page<ContractSignVO> page = new Page<>(contractSignDTO.getPageNum(), contractSignDTO.getPageSize());
+        Page<ContractSignVO> page = new Page<>(contractSignDTO.getPageNo(), contractSignDTO.getPageSize());
         return appContractSignMapper.queryUserSignContractList(page,contractSignDTO);
     }
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppInstructorController.java

@@ -240,7 +240,10 @@ public class AppInstructorController extends JeecgController<AppInstructor, IApp
 			if (departById==null){
 				return Result.error("未查询到部门信息");
 			}
-			SysUser sysUserByid = sysUserService.findById(staffVO.getStaffId());
+			SysUser sysUserById = sysUserService.findById(staffVO.getStaffId());
+			if (sysUserById==null){
+				return Result.error("编辑失败!未查询到需要编辑的员工信息。");
+			}
 			LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 			SysUser sysUser = new SysUser();
 			BeanUtils.copyProperties(staffSaveVO,sysUser);
@@ -248,7 +251,10 @@ public class AppInstructorController extends JeecgController<AppInstructor, IApp
 			sysUser.setOrgCode(departById.getOrgCode());
 			sysUser.setUpdateBy(loginUser.getUsername());
 			sysUser.setUpdateTime(new Date());
-			String passwordEncode = PasswordUtil.encrypt(sysUserByid.getUsername(), staffSaveVO.getPassword(), sysUserByid.getSalt());
+			String passwordEncode =sysUserById.getPassword();
+			if (StringUtils.isNotEmpty(staffSaveVO.getPassword())){
+				passwordEncode = PasswordUtil.encrypt(sysUserById.getUsername(), staffSaveVO.getPassword(), sysUserById.getSalt());
+			}
 			sysUser.setPassword(passwordEncode);
 			sysUserService.editUser(sysUser, staffSaveVO.getSelectedroles(), staffSaveVO.getSelecteddeparts(), null, null);
 			boolean fal=StringUtils.isNotEmpty(staffVO.getInstructorId());

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/ContractSignDTO.java

@@ -12,7 +12,7 @@ import java.util.Date;
 @Data
 @Accessors(chain = true)
 public class ContractSignDTO{
-    public Integer pageNum;
+    public Integer pageNo;
     public Integer pageSize;
     @JsonFormat(timezone = "GMT+8",pattern = "MM-dd")
     @DateTimeFormat(pattern="MM-dd")