Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseExpertController.java

@@ -67,6 +67,15 @@ public class BaseExpertController extends BaseController {
         baseExpertVo.setCreateTime(new Date());
         baseExpertVo.setUpdated(baseExpertVo.getCreated());
         baseExpertVo.setUpdateTime(baseExpertVo.getCreateTime());
+        if (!ObjectUtils.isEmpty(baseExpertVo.getMajorType())) {
+            return error("专业类型为空");
+        }
+        LambdaQueryWrapper<BaseProfessional> lw = new LambdaQueryWrapper();
+        lw.eq(BaseProfessional::getProfessionalCode, baseExpertVo.getMajorType());
+        List<BaseProfessional> list = baseProfessionalService.list(lw);
+        if (ObjectUtils.isEmpty(list) || list.size() < 1) {
+            return error("专业类型传值错误");
+        }
         return toAjax(baseExpertService.insertExpert(baseExpertVo));
     }
 
@@ -92,6 +101,15 @@ public class BaseExpertController extends BaseController {
 
         baseExpert.setUpdated(getUserId().toString());
         baseExpert.setUpdateTime(new Date());
+        if (!ObjectUtils.isEmpty(baseExpert.getMajorType())) {
+            return error("专业类型为空");
+        }
+        LambdaQueryWrapper<BaseProfessional> lw = new LambdaQueryWrapper();
+        lw.eq(BaseProfessional::getProfessionalCode, baseExpert.getMajorType());
+        List<BaseProfessional> list = baseProfessionalService.list(lw);
+        if (ObjectUtils.isEmpty(list) || list.size() < 1) {
+            return error("专业类型传值错误");
+        }
         return toAjax(baseExpertService.updateById(baseExpert));
     }
 
@@ -125,7 +143,7 @@ public class BaseExpertController extends BaseController {
             // 专业类型
             if (!org.apache.commons.lang3.StringUtils.isBlank(vo.getMajorType())) {
                 LambdaQueryWrapper<BaseProfessional> lwe = new LambdaQueryWrapper<>();
-                lwe.eq(BaseProfessional::getId, Integer.parseInt(vo.getMajorType()));
+                lwe.eq(BaseProfessional::getProfessionalCode, vo.getMajorType());
                 List<BaseProfessional> list1 = baseProfessionalService.list(lwe);
                 if (!ObjectUtils.isEmpty(list1)) {
                     vo.setMajorTypeName(list1.get(0).getProfessionalName());

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseNoticeController.java

@@ -149,20 +149,6 @@ public class BaseNoticeController extends BaseController {
     @Log(title = ModularConstans.notice, businessType = BusinessType.QUERY)
     public AjaxResult homePage(@NotEmpty(message = "数据为空")
                            @RequestBody BaseNoticePageReqVo vo) {
-//        LambdaQueryWrapper<BaseNotice> lw = new LambdaQueryWrapper<>();
-//        if(!StringUtils.isBlank(vo.getTitle())){
-//            lw.like(BaseNotice::getTitle,vo.getTitle());
-//        }
-//        if(!ObjectUtils.isEmpty(vo.getStartTime())){
-//            lw.ge(BaseNotice::getReleaseTime,vo.getStartTime());
-//        }
-//        if(!ObjectUtils.isEmpty(vo.getStartTime())){
-//            lw.le(BaseNotice::getReleaseTime,vo.getEntTime());
-//        }
-//        if (!ObjectUtils.isEmpty(vo.getType())) {
-//            lw.eq(BaseNotice::getType, vo.getType());
-//        }
-//        lw.orderByDesc(BaseNotice::getReleaseTime);
         vo.setUserId(getUserId());
         vo.setDeptId(getDeptId());
         IPage<BaseNotice> page = baseNoticeService.queryPage(vo);

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanYearsController.java

@@ -10,6 +10,9 @@ import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.enums.DataIsDelete;
+import com.ozs.common.exception.ServiceException;
+import com.ozs.common.exception.base.BaseException;
+import com.ozs.common.core.domain.entity.SysProcurementStandard;
 import com.ozs.common.utils.PageUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
@@ -20,7 +23,9 @@ import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import com.ozs.plan.doman.vo.responseVo.PlanYearsResponseVo;
 import com.ozs.plan.service.PlanYearsService;
 import com.ozs.plan.service.impl.PlanYearsServiceImpl;
+import com.ozs.pm.doman.PmAuditDeptRef;
 import com.ozs.system.service.ISysDeptService;
+import com.ozs.system.service.SysProcurementStandardService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -28,16 +33,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -58,7 +60,7 @@ public class PlanYearsController extends BaseController {
     @Autowired
     private ISysDeptService iSysDeptService;
     @Autowired
-    private PlanYearsServiceImpl planYearsServiceImpl;
+    private SysProcurementStandardService sysProcurementStandardService;
 
 
     @ApiOperation(value = "查询年度计划")
@@ -97,7 +99,7 @@ public class PlanYearsController extends BaseController {
             lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
             lw.orderBy(true, false, PlanYears::getCreateTime);
             List<PlanYears> planYears = planYearsService.list(lw);
-            planYearsList = planYearsServiceImpl.changeTo(planYears);
+            planYearsList = planYearsService.changeTo(planYears);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -118,7 +120,7 @@ public class PlanYearsController extends BaseController {
             vo.setCreated(String.valueOf(loginUser.getUserId()));
             List<PlanYears> planYears = planYearsService.queryPage(vo);
             if (!ObjectUtils.isEmpty(planYears) && !ObjectUtils.isEmpty(planYears.size())) {
-                planYearsList = planYearsServiceImpl.changeTo(planYears);
+                planYearsList = planYearsService.changeTo(planYears);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -281,23 +283,130 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "获取采购服务站")
     @GetMapping("/getProcurementService")
-    // @PreAuthorize("@ss.hasPermi('plan:planYears:getProcurementService')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.QUERY)
-    public AjaxResult getProcurementService() {
+    public AjaxResult getProcurementService(@RequestParam("projectType") String projectType,
+                                            @RequestParam("evaluation") BigDecimal evaluation) {
         //获取当前登录人的部门ID
         LoginUser loginUser = getLoginUser();
+        List<String> list = new ArrayList<>();
+        list.add("网空采购站");
         if (StringUtils.isNull(loginUser) || StringUtils.isNull(loginUser.getDeptId())) {
-            return success("当前登陆过期，请重新登录！");
+            return error("当前登陆过期，请重新登录！");
         }
         Long deptId = loginUser.getDeptId();
         // 获取当前登陆人的部门名称
         SysDept sysDept = iSysDeptService.selectById(deptId);
         if (StringUtils.isNull(sysDept) || StringUtils.isNull(sysDept.getDeptName())) {
-            return success("当前登陆人没有部门信息，请核对数据！");
+            return error("当前登陆人没有部门信息，请核对数据！");
+        }
+
+        String str = sysDept.getPurchaseServices();
+        if (!ObjectUtils.isEmpty(evaluation) && !ObjectUtils.isEmpty(projectType)) {
+            String[] ancestors = sysDept.getAncestors().split(",");
+            //当前用户的部门，是否允许提交（不在规定等级范围不可提交）
+            //查询当前用户的部门是否有上级，是否需要上级及祖级进行审核
+            Long cdeptId = null;
+            Long bdeptId = null;
+            String deptLevel = null;
+            if (ancestors.length == 2) { //C级
+                deptLevel = "C";
+            } else if (ancestors.length == 3) { //B级
+                deptLevel = "B";
+                cdeptId = Long.valueOf(ancestors[2]);
+            } else if (ancestors.length == 4) { //A级
+                deptLevel = "A";
+                cdeptId = Long.valueOf(ancestors[2]);
+                bdeptId = Long.valueOf(ancestors[3]);
+            }
+            if (!Arrays.asList("A", "B", "C").contains(deptLevel)) {
+                return success(list);
+            }
+
+            switch (deptLevel) {
+                case "A":
+                    LambdaQueryWrapper<SysProcurementStandard> queryWrapperA = new LambdaQueryWrapper<>();
+                    queryWrapperA.eq(SysProcurementStandard::getDeptId, deptId);
+                    queryWrapperA.eq(SysProcurementStandard::getCategory, projectType.equals("2") ? "1" : projectType.equals("1") ? "2" : projectType);
+                    List<SysProcurementStandard> sysProcurementStandardsListA = sysProcurementStandardService.list(queryWrapperA);
+                    if (ObjectUtils.isEmpty(sysProcurementStandardsListA)) {
+                        throw new ServiceException("部门id为" + deptId + "的部门采购标准未进行初始化！");
+                    }
+                    //A不限额就自己审核
+                    SysProcurementStandard sA = sysProcurementStandardsListA.get(0);
+                    if (sA.getState().equals(Integer.valueOf(0))) {
+                        //采用初始化数据
+                    } else {
+                        //A限额了判断是否超额，不超额就自己审。超额了追加上级
+                        BigDecimal maximum = sA.getMaximum();
+                        if (maximum.compareTo(evaluation) == 1) {
+                            //采用初始化数据
+                        } else {
+                            //A限额了，找B
+                            SysDept b = iSysDeptService.selectById(bdeptId);
+                            LambdaQueryWrapper<SysProcurementStandard> queryWrapperB = new LambdaQueryWrapper<>();
+                            queryWrapperB.eq(SysProcurementStandard::getDeptId, bdeptId);
+                            queryWrapperB.eq(SysProcurementStandard::getCategory, projectType.equals("2") ? "1" : projectType.equals("1") ? "2" : projectType);
+                            List<SysProcurementStandard> sysProcurementStandardsListB = sysProcurementStandardService.list(queryWrapperB);
+                            //B不限额，B审
+                            if (ObjectUtils.isEmpty(sysProcurementStandardsListB)) {
+                                throw new ServiceException("部门id为" + bdeptId + "的部门采购标准未进行初始化！");
+                            }
+                            SysProcurementStandard sB = sysProcurementStandardsListB.get(0);
+                            if (sB.getState().equals(Integer.valueOf(0))) {
+                                //refB采用初始化数据
+
+                                str = b.getPurchaseServices();
+                            } else {
+                                //B限额了判断是否超额，不超额就自己审。超额了追加C级
+                                str = b.getPurchaseServices();
+                                BigDecimal maximumB = sB.getMaximum();
+                                //B超额
+                                if (maximumB.compareTo(evaluation) == -1) {
+                                    SysDept c = iSysDeptService.selectById(cdeptId);
+                                    str = c.getPurchaseServices();
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case "B":
+                    // B的判断  最少插入1条。最多插入2条
+                    SysDept b = iSysDeptService.selectById(bdeptId);
+                    LambdaQueryWrapper<SysProcurementStandard> queryWrapperB = new LambdaQueryWrapper<>();
+                    queryWrapperB.eq(SysProcurementStandard::getDeptId, deptId);
+                    queryWrapperB.eq(SysProcurementStandard::getCategory, projectType.equals("2") ? "1" : projectType.equals("1") ? "2" : projectType);
+                    List<SysProcurementStandard> sysProcurementStandardsListB = sysProcurementStandardService.list(queryWrapperB);
+                    //B不限额，B审
+                    if (ObjectUtils.isEmpty(sysProcurementStandardsListB)) {
+                        throw new ServiceException("部门id为" + deptId + "的部门采购标准未进行初始化！");
+                    }
+                    SysProcurementStandard sB = sysProcurementStandardsListB.get(0);
+                    if (sB.getState() == 0) {
+
+                        str = b.getPurchaseServices();
+                    } else {
+                        //B限额了判断是否超额，不超额就自己审。超额了追加C级
+                        BigDecimal maximumB = sB.getMaximum();
+                        //B不超额B审
+                        if (maximumB.compareTo(evaluation) == 1) {
+                            str = b.getPurchaseServices();
+                        } else {
+                            SysDept c = iSysDeptService.selectById(cdeptId);
+                            str = c.getPurchaseServices();
+                        }
+                    }
+
+                    break;
+                default:
+                    SysDept c = iSysDeptService.selectById(cdeptId);
+                    str = c.getPurchaseServices();
+
+            }
+        }
+
+        if (!org.apache.commons.lang3.StringUtils.isBlank(str)) {
+            list.add(str);
         }
-        List<String> list = new ArrayList<>();
-        list.add("网空采购站");
-        list.add(sysDept.getPurchaseServices());
         return success(list);
     }
 }

purchase-system/src/main/java/com/ozs/base/mapper/BaseNoticeMapper.java

@@ -23,7 +23,7 @@ public interface BaseNoticeMapper extends BaseMapper<BaseNotice> {
             " base_notice b left join pm_audit_dept_ref r " +
             " on b.demand_id = r.ref_id   " +
             " where (#{userId} = 1  or  (r.dept_id = #{deptId} and  r.ref_type = 2) )    " +
-            " and (#{title} is null  or   b.title like concat('%',#{title},'%'))  " +
+            " and (#{noticeName} is null  or   b.name like concat('%',#{noticeName},'%'))  " +
             " and (#{type} is null  or   b.type = #{type})  " +
             " and (#{startTime} is null  or   to_days(b.release_time) >= to_days(#{startTime}) ) " +
             " and (#{entTime} is null  or   to_days(b.release_time) <= to_days(#{entTime}) ) " +

purchase-system/src/main/java/com/ozs/base/service/impl/BaseExpertServiceImpl.java

@@ -101,20 +101,24 @@ public class BaseExpertServiceImpl extends ServiceImpl<BaseExpertMapper, BaseExp
         List<PmDemand> pmDemandList = pmDemandService.selectExtractionExpert(baseExpertVo);
         List<PmDemandResVo> pmDemandResponseVoList = changTo(pmDemandList);
         // 遍历项目 查询专家姓名
-        for (PmDemandResVo pmDemandResVo : pmDemandResponseVoList) {
-            Long demandId = pmDemandResVo.getDemandId();
-            // 查询项目专家关联表 专家ID，关联时间
-            List<PmDemandExpertRef> pmDemandExpertRefList = baseExpertMapper.getExpertIdList(demandId);
-            // 专家ID列表
-            List<Long> expertList= pmDemandExpertRefList.stream().map(PmDemandExpertRef::getExpertId).collect(Collectors.toList());
-            // 获取抽取时间（列表中取其中一个时间）
-            Date accessTime = pmDemandExpertRefList.get(0).getAccessTime();
-            Map<String, String> map = baseExpertMapper.getExpertNameList(expertList);
-            String expertNameStr = map.get("expertName");
-            String varietyPurchaseStr = map.get("varietyPurchase");
-            pmDemandResVo.setExpertNameStr(expertNameStr);
-            pmDemandResVo.setVarietyPurchaseStr(varietyPurchaseStr);
-            pmDemandResVo.setAccessTime(accessTime);
+        if (!ObjectUtils.isEmpty(pmDemandResponseVoList) && pmDemandResponseVoList.size() > 0) {
+            for (PmDemandResVo pmDemandResVo : pmDemandResponseVoList) {
+                Long demandId = pmDemandResVo.getDemandId();
+                // 查询项目专家关联表 专家ID，关联时间
+                List<PmDemandExpertRef> pmDemandExpertRefList = baseExpertMapper.getExpertIdList(demandId);
+                // 专家ID列表
+                List<Long> expertList = pmDemandExpertRefList.stream().map(PmDemandExpertRef::getExpertId).collect(Collectors.toList());
+                // 获取抽取时间（列表中取其中一个时间）
+                Date accessTime = pmDemandExpertRefList.get(0).getAccessTime();
+                Map<String, String> map = baseExpertMapper.getExpertNameList(expertList);
+                if (!ObjectUtils.isEmpty(map)) {
+                    String expertNameStr = map.get("expertName");
+                    String varietyPurchaseStr = map.get("varietyPurchase");
+                    pmDemandResVo.setExpertNameStr(expertNameStr);
+                    pmDemandResVo.setVarietyPurchaseStr(varietyPurchaseStr);
+                }
+                pmDemandResVo.setAccessTime(accessTime);
+            }
         }
         PageHelper.startPage(baseExpertVo.getPageNum().intValue(), baseExpertVo.getPageSize().intValue());
         PageInfo<PmDemandResVo> pageInfo = new PageInfo<>(pmDemandResponseVoList);

purchase-system/src/main/java/com/ozs/base/service/impl/BaseNoticeServiceImpl.java

@@ -29,7 +29,7 @@ public class BaseNoticeServiceImpl extends ServiceImpl<BaseNoticeMapper, BaseNot
     public IPage<BaseNotice> queryPage(BaseNoticePageReqVo vo) {
         int pageNum = Integer.parseInt(vo.getPageNum().toString());
         int pageSize = Integer.parseInt(vo.getPageSize().toString());
-        vo.setTitle(StringUtils.isBlank(vo.getTitle()) ? null : vo.getTitle());
+        vo.setNoticeName(StringUtils.isBlank(vo.getNoticeName()) ? null : vo.getNoticeName());
         Page<BaseNotice> page = PageHelper.startPage(pageNum, pageSize)
                 .doSelectPage(() -> baseNoticeMapper.query(vo));
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseNotice> pageR =

purchase-system/src/main/java/com/ozs/base/vo/BaseNoticePageReqVo.java

@@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
 import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 
-@ApiModel(value = "BaseNoticePageReqVo", description = ModularConstans.notice+ "分页查询实体")
+@ApiModel(value = "BaseNoticePageReqVo", description = ModularConstans.notice + "分页查询实体")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -22,6 +22,8 @@ public class BaseNoticePageReqVo extends PageVo {
     @ApiModelProperty("公告标题")
     private String title;
 
+    @ApiModelProperty("项目名称")
+    private String noticeName;
     // 开始时间
     @ApiModelProperty("开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd")

purchase-system/src/main/java/com/ozs/plan/service/PlanYearsService.java

@@ -256,4 +256,6 @@ public interface PlanYearsService extends IService<PlanYears> {
      * 查询审核分页
      */
     List<PlanYears> queryPage(PlanYearsStandardVo vo);
+
+    List<PlanYearsResponseVo> changeTo(List<PlanYears> planYears);
 }

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -464,7 +464,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
                         // 判断当前用户是否有审核权限
                         boolean flay = true;
-                        for (PmAuditDeptRef pmAuditDeptRef : listl) {
+                        List<PmAuditDeptRef> collect1 = listl.stream()
+                                .filter(pmAuditDeptRef -> pmAuditDeptRef.getRefId().equals(vo.getDemandId()))
+                                .collect(Collectors.toList());
+                        for (PmAuditDeptRef pmAuditDeptRef : collect1) {
                             if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) > 0
                                     && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
                                 flay = false;

purchase-system/src/main/java/com/ozs/system/domain/vo/responseVo/SysDeptResponseVo.java

@@ -59,8 +59,17 @@ public class SysDeptResponseVo implements Serializable {
      * 账号
      */
     private String accountNumber;
-    /** 法定代表人 */
+    /**
+     * 法定代表人
+     */
     private String leader;
-    /** 邮政编码 */
+    /**
+     * 邮政编码
+     */
     private String email;
+
+    /**
+     * 采购服务站名称
+     */
+    private String purchaseServices;
 }

purchase-system/src/main/java/com/ozs/system/service/impl/SysDictTypeServiceImpl.java

@@ -212,7 +212,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
         HashMap<String, String> projectStatusMap = new LinkedHashMap<>();
         HashMap<String, String> planPurchaseModesMap = new LinkedHashMap<>();
         HashMap<String, String> projectAttributes = new LinkedHashMap<>();
-        HashMap<String, String> purchaseServices = new LinkedHashMap<>();
 
         //项目审核状态
         for (ProjectStatus value : ProjectStatus.values()) {
@@ -222,11 +221,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
         for (PlanPurchaseMode value : PlanPurchaseMode.values()) {
             planPurchaseModesMap.put(value.getInfo(), value.getCode());
         }
-        //采购服务站
-        List<SysDictData> data = dictDataMapper.selectDictDataByType(Constants.PURCHASE_SERVICES);
-        for (SysDictData dictData : data) {
-            purchaseServices.put(dictData.getDictLabel(), dictData.getDictValue());
-        }
         //项目属性
         List<SysDictData> data1 = dictDataMapper.selectDictDataByType(Constants.SYS_PROJECT_ATTR);
         for (SysDictData dictData : data1) {
@@ -242,7 +236,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
         hashMap.put("projectStatus", projectStatusMap);
         hashMap.put("planPurchaseModes", planPurchaseModesMap);
         hashMap.put("projectAttributes", projectAttributes);
-        hashMap.put("purchaseServices", purchaseServices);
         return hashMap;
     }
 }

purchase-system/src/main/resources/mapper/base/BaseExpertMapper.xml

@@ -163,6 +163,11 @@
     </select>
 
     <select id="getExpertNameList" resultType="java.util.Map" parameterType="java.util.List">
-        select GROUP_CONCAT(variety_purchase) varietyPurchase, GROUP_CONCAT(expert_name) expertName from base_expert where id in #{expertList}
+        select GROUP_CONCAT(variety_purchase) varietyPurchase, GROUP_CONCAT(expert_name) expertName from base_expert
+        where id in
+        <foreach collection="expertList" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+
     </select>
 </mapper>

purchase-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -61,12 +61,27 @@
     </select>
 
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.remarks,d.address
-		,d.project_contact,d.bank_account_name,d.bank_of_deposit,d.account_number,
-			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
-		from sys_dept d
-		where d.dept_id = #{deptId}
-	</select>
+        select d.dept_id,
+               d.parent_id,
+               d.ancestors,
+               d.dept_name,
+               d.order_num,
+               d.leader,
+               d.phone,
+               d.email,
+               d.status,
+               d.remarks,
+               d.address
+                ,
+               d.project_contact,
+               d.bank_account_name,
+               d.bank_of_deposit,
+               d.account_number,
+               d.purchase_services,
+               (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
+        from sys_dept d
+        where d.dept_id = #{deptId}
+    </select>
 
     <select id="checkDeptExistUser" parameterType="Long" resultType="int">
 		select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'