优化员工管理修改密码问题

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

@@ -240,6 +240,7 @@ public class AppInstructorController extends JeecgController<AppInstructor, IApp
 			if (departById==null){
 				return Result.error("未查询到部门信息");
 			}
+			SysUser sysUserByid = sysUserService.findById(staffVO.getStaffId());
 			LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 			SysUser sysUser = new SysUser();
 			BeanUtils.copyProperties(staffSaveVO,sysUser);
@@ -247,6 +248,8 @@ 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());
+			sysUser.setPassword(passwordEncode);
 			sysUserService.editUser(sysUser, staffSaveVO.getSelectedroles(), staffSaveVO.getSelecteddeparts(), null, null);
 			boolean fal=StringUtils.isNotEmpty(staffVO.getInstructorId());
 			AppInstructor appInstructor = new AppInstructor();

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

@@ -13,14 +13,12 @@ import org.jeecg.modules.system.app.dto.AppSitePageDTO;
 import org.jeecg.modules.system.app.entity.AppSite;
 import org.jeecg.modules.system.app.service.IAppSitePriceRulesService;
 import org.jeecg.modules.system.app.service.IAppSiteService;
-import org.jeecg.modules.system.app.vo.AppSiteListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 
 /**
@@ -132,8 +130,8 @@ public class AppSiteController extends JeecgController<AppSite, IAppSiteService>
 	//@AutoLog(value = "场地表-通过orgCode查询")
 	@Operation(summary="商户信息补充-通过orgCode查询")
 	@GetMapping(value = "/querySiteListByOrgCode")
-	public Result<List<AppSiteListVO>> querySiteListByOrgCode(@RequestParam(name="orgCode",required=true) String orgCode) {
-		return Result.ok(appSiteService.querySiteListByOrgCode(orgCode));
+	public Result<AppSiteDTO> querySiteByOrgCode(@RequestParam(name="orgCode",required=true) String orgCode) {
+		return Result.ok(appSiteService.querySiteByOrgCode(orgCode));
 	}
 
     /**

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

@@ -1,13 +1,10 @@
 package org.jeecg.modules.system.app.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.system.app.dto.AppSiteDTO;
 import org.jeecg.modules.system.app.dto.AppSitePageDTO;
 import org.jeecg.modules.system.app.entity.AppSite;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.system.app.vo.AppSiteListVO;
-
-import java.util.List;
 
 /**
  * @Description: 商户表
@@ -40,7 +37,7 @@ public interface IAppSiteService extends IService<AppSite> {
      * @param orgCode
      * @return
      */
-    List<AppSiteListVO> querySiteListByOrgCode(String orgCode);
+    AppSiteDTO querySiteByOrgCode(String orgCode);
     /**
      * 删除商户
      * @param id

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

@@ -4,30 +4,26 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.system.app.dto.*;
+import org.jeecg.modules.system.app.dto.AppSiteDTO;
+import org.jeecg.modules.system.app.dto.AppSitePageDTO;
 import org.jeecg.modules.system.app.entity.AppSite;
 import org.jeecg.modules.system.app.mapper.AppSiteMapper;
 import org.jeecg.modules.system.app.mapper.AppSitePriceRulesMapper;
 import org.jeecg.modules.system.app.service.IAppSiteService;
-import org.jeecg.modules.system.app.vo.AppSiteListVO;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.mapper.SysDepartMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 import static org.jeecg.common.constant.CommonConstant.SC_INTERNAL_SERVER_ERROR_500;
 
 /**
@@ -55,10 +51,13 @@ public class AppSiteServiceImpl extends ServiceImpl<AppSiteMapper, AppSite> impl
         if (null == departById) throw new JeecgBootException("商户部门不存在", SC_INTERNAL_SERVER_ERROR_500);
         if (!(departById.getOrgCategory().equals("30")||departById.getOrgCategory().equals("20"))) throw new JeecgBootException("商户部门类型错误", SC_INTERNAL_SERVER_ERROR_500);
         BeanUtils.copyProperties(siteCuDTO, site);
-        if (null == site.getOrgCode())
+        if (null == departById.getOrgCode())
             throw new JeecgBootException("商户部门编码不能为空", SC_INTERNAL_SERVER_ERROR_500);
-        if (null == site.getTenantId())
+        if (null == departById.getTenantId())
             throw new JeecgBootException("商户部门id不能为空", SC_INTERNAL_SERVER_ERROR_500);
+
+        site.setOrgCode(departById.getOrgCode());
+        site.setTenantId(departById.getTenantId()+"");
         int saveSiteResult = baseMapper.insert(site);
         // 如果插入失败，抛出自定义异常提示“场地信息保存失败”
         if (saveSiteResult < 1) {
@@ -97,13 +96,14 @@ public class AppSiteServiceImpl extends ServiceImpl<AppSiteMapper, AppSite> impl
     }
 
     @Override
-    public List<AppSiteListVO> querySiteListByOrgCode(String orgCode) {
-        List<AppSite> siteList = baseMapper.selectList(Wrappers.<AppSite>lambdaQuery().eq(AppSite::getOrgCode, orgCode));
-        return siteList.stream().map(dbSite -> {
-            AppSiteListVO siteVO = new AppSiteListVO();
-            BeanUtils.copyProperties(dbSite, siteVO);
-            return siteVO;
-        }).collect(Collectors.toList());
+    public AppSiteDTO querySiteByOrgCode(String orgCode) {
+        AppSite site = baseMapper.selectOne(Wrappers.<AppSite>lambdaQuery().eq(AppSite::getOrgCode, orgCode));
+        AppSiteDTO siteVO = new AppSiteDTO();
+        if (site!=null){
+            BeanUtils.copyProperties(site, siteVO);
+        }
+
+        return siteVO;
     }
 
     @Override

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -492,4 +492,7 @@ public interface ISysUserService extends IService<SysUser> {
     SysUser findByUserName(String username);
 
 	Integer updateDelStatus(SysUser sysUser);
+
+	SysUser findById(String staffId);
+
 }

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

@@ -2385,4 +2385,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	public Integer updateDelStatus(SysUser sysUser) {
 		return  userMapper.updateDelStatus(sysUser);
 	}
+
+	@Override
+	public SysUser findById(String staffId) {
+		return userMapper.selectById(staffId);
+	}
 }