人员信息获取修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/controller/ReimbursementUserController.java

@@ -88,7 +88,6 @@ public class ReimbursementUserController {
     @GetMapping("findList")
     public ResponseEntity findList(ReimbursementUserDTO reimbursementUser, Page<ReimbursementUserDTO> page) {
         IPage<ReimbursementUserDTO> list = service.findList(page,reimbursementUser);
-        System.out.println("ReimbursementUserDTO:"+list.getRecords().get(0).getAddressName());
         return ResponseEntity.ok(list);
     }
 

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -20,6 +20,7 @@ import com.jeeplus.core.excel.utils.EasyPoiUtil;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.security.util.SecurityUtils;
 import com.jeeplus.sys.constant.CommonConstants;
+import com.jeeplus.sys.domain.Office;
 import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.service.OfficeService;
 import com.jeeplus.sys.service.UserService;
@@ -225,6 +226,13 @@ public class UserController {
                     if ( isCheckLoginName ( "", user.getLoginName ( ) ) ) {
                         user.setPassword ( SecurityUtils.encryptPassword ( "123456" ) );
                         BeanValidators.validateWithException ( validator, user );
+                        //查询人员公司信息
+                        Office company = officeService.getOfficeByName(user.getCompanyDTO().getName(),"");
+                        user.getCompanyDTO().setId(company.getId());
+                        //查询人员部门信息
+                        Office office = officeService.getOfficeByName(user.getOfficeDTO().getName(),user.getOfficeDTO().getParentName());
+                        user.getOfficeDTO().setId(office.getId());
+                        user.setLoginFlag("1");
                         userService.save ( UserWrapper.INSTANCE.toEntity ( user ) );
                         successNum++;
                     } else {

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/OfficeMapper.java

@@ -5,6 +5,7 @@ package com.jeeplus.sys.mapper;
 
 import com.jeeplus.core.domain.TreeMapper;
 import com.jeeplus.sys.domain.Office;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 机构MAPPER接口
@@ -14,4 +15,6 @@ import com.jeeplus.sys.domain.Office;
  */
 public interface OfficeMapper extends TreeMapper<Office> {
 
+    Office getOfficeByName(@Param("officeName") String officeName, @Param("parentName") String parentName);
+
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/OfficeMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeeplus.sys.mapper.OfficeMapper">
 
+
+    <select id="getOfficeByName" resultType="com.jeeplus.sys.domain.Office">
+        select * from sys_office
+        <where>
+            name = #{officeName}
+            <if test="null != parentName and '' != parentName">
+                and parent_id = (select id from sys_office where name = #{parentName} and del_flag = 0)
+            </if>
+            and del_flag = 0
+        </where>
+    </select>
 </mapper>

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -163,7 +163,7 @@
 		FROM sys_user a
 		<include refid="userJoins"/>
 		<where>
-			a.company_id = #{companyId} and a.del_flag = 0
+			a.del_flag = 0
 		</where>
 	</select>
 

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/OfficeService.java

@@ -32,6 +32,9 @@ public class OfficeService extends TreeService<OfficeMapper, Office> {
     @Autowired
     private OfficeWrapper officeWrapper;
 
+    @Autowired
+    private OfficeMapper mapper;
+
     public List <OfficeDTO> getRootTree(List<OfficeDTO> list, String extId, String type, String showAll) {
         List<OfficeDTO> offices = Lists.newArrayList ();
         List<OfficeDTO> rootTrees = officeWrapper.toDTO (super.getChildren (new Office (OfficeDTO.getRootId ())));
@@ -111,6 +114,16 @@ public class OfficeService extends TreeService<OfficeMapper, Office> {
                 &&(CommonConstants.YES.equals ( showAll ) || CommonConstants.YES.equals (dto.getUseable ()));
     }
 
+    /**
+     * 根据部门名称查询部门信息
+     * @param officeName
+     * @return
+     */
+    public Office getOfficeByName(String officeName,String parentName){
+        Office office = mapper.getOfficeByName(officeName,parentName);
+        return office;
+    }
+
 
 
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/dto/OfficeDTO.java

@@ -118,6 +118,14 @@ public class OfficeDTO extends TreeDTO <OfficeDTO> {
 	private String loginName;
 
 	/**
+	 * 父级部门
+	 */
+	@Length(min = 1, max = 100)
+	@Excel (name = "父级部门")
+	@Query
+	private String parentName;
+
+	/**
 	 * 密码
 	 */
 	@JsonIgnore

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/dto/UserDTO.java

@@ -49,6 +49,8 @@ public class UserDTO extends BaseDTO {
      */
     @JsonIgnore
     @Length(min = 1, max = 100)
+    @Excel (name = "密码")
+    @Query
     private String password;