用户删除功能优化，添加是否主库字段

src/main/java/com/chinaitop/depot/DepotSystemApplication.java

@@ -6,11 +6,13 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @EnableEurekaClient
 @EnableDiscoveryClient
 @SpringBootApplication
 @EnableFeignClients
+@EnableTransactionManagement
 @MapperScan(basePackages = {"com.chinaitop.depot.system.mapper"})
 public class DepotSystemApplication {
 

src/main/java/com/chinaitop/depot/system/controller/UserInfoController.java

@@ -603,11 +603,13 @@ public class UserInfoController {
 	public Map<String, Object> remove(Integer userId) {
 		Map<String, Object> modelMap = new HashMap<>();
 		if (userId != null) {
-			userInfoService.remove(userId);
-			userRoleService.deleteById(userId);//删除用户角色信息
-			userOrgService.deleteById(userId);//删除用户机构权限信息
+			try {
+				userInfoService.deleteAll(userId);
+				modelMap.put("status", "success");
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 		}
-		modelMap.put("status", "success");
 		return modelMap;
 	}
 	

src/main/java/com/chinaitop/depot/system/mapper/OrgInfoMapper.xml

@@ -61,6 +61,7 @@
     <result column="frlxfs" property="frlxfs" jdbcType="VARCHAR" />
     <result column="yxgr" property="yxgr" jdbcType="DECIMAL" />
     <result column="kqbm" property="kqbm" jdbcType="VARCHAR" />
+    <result column="sfzk" property="sfzk" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.chinaitop.depot.system.model.OrgInfo">
     <result column="wjl" jdbcType="LONGVARCHAR" property="wjl" />
@@ -132,7 +133,7 @@
     parent_id, status, del_flag, birds_eye, birds_Remote, brief_introduction, invoice_title, 
     regist_number, bank_name, account_name, account_number,level_code,total_assets,corporate_capacity,
     office_phone,registered_address,mail_box,official_website,house_number,tank_number,depot_property,
-    updatetime,frlxfs,yxgr,kqbm
+    updatetime,frlxfs,yxgr,kqbm,sfzk
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.system.model.OrgInfoExample" >
     select
@@ -182,7 +183,7 @@
       regist_number, bank_name, account_name, 
       account_number,total_assets,corporate_capacity,
       office_phone,registered_address,mail_box,official_website,
-      house_number,tank_number,depot_property,level_code,wjl,frlxfs,yxgr,kqbm)
+      house_number,tank_number,depot_property,level_code,wjl,frlxfs,yxgr,kqbm,sfzk)
     values (#{orgId,jdbcType=INTEGER}, #{orgName,jdbcType=VARCHAR}, #{shortName,jdbcType=VARCHAR}, 
       #{orgCode,jdbcType=VARCHAR}, #{orgClassId,jdbcType=INTEGER}, #{companyNature,jdbcType=INTEGER}, 
       #{busiType,jdbcType=INTEGER}, #{address,jdbcType=VARCHAR}, #{contact,jdbcType=VARCHAR}, 
@@ -202,7 +203,7 @@
       #{officePhone,jdbcType=VARCHAR}, #{registeredAddress,jdbcType=VARCHAR}, #{mailBox,jdbcType=VARCHAR}, 
       #{officialWebsite,jdbcType=VARCHAR}, #{houseNumber,jdbcType=INTEGER}, #{tankNumber,jdbcType=INTEGER}, 
       #{depotProperty,jdbcType=VARCHAR}, #{levelCode,jdbcType=VARCHAR}, #{wjl,jdbcType=LONGVARCHAR},
-      #{frlxfs,jdbcType=VARCHAR}, #{yxgr,jdbcType=DECIMAL}, #{kqbm,jdbcType=VARCHAR})
+      #{frlxfs,jdbcType=VARCHAR}, #{yxgr,jdbcType=DECIMAL}, #{kqbm,jdbcType=VARCHAR}, #{sfzk,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.system.model.OrgInfo" useGeneratedKeys="true" keyProperty="orgId">
     insert into org_info
@@ -354,6 +355,9 @@
       <if test="kqbm != null">
       	kqbm,
       </if>
+      <if test="sfzk != null">
+        sfzk,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="orgId != null" >
@@ -503,6 +507,9 @@
       <if test="kqbm != null">
       	#{kqbm,jdbcType=VARCHAR},
       </if>
+      <if test="sfzk != null">
+        #{sfzk,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.system.model.OrgInfoExample" resultType="java.lang.Integer" >
@@ -664,6 +671,9 @@
       <if test="record.kqbm != null">
       	kqbm = #{record.kqbm,jdbcType=VARCHAR},
       </if>
+      <if test="record.sfzk != null">
+        sfzk = #{record.sfzk,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -719,7 +729,8 @@
       wjl = #{record.wjl,jdbcType=LONGVARCHAR},
       frlxfs = #{record.frlxfs,jdbcType=VARCHAR},
       yxgr = #{record.yxgr,jdbcType=DECIMAL},
-      kqbm = #{record.kqbm,jdbcType=VARCHAR}
+      kqbm = #{record.kqbm,jdbcType=VARCHAR},
+      sfzk = #{record.sfzk,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -901,6 +912,9 @@
       <if test="kqbm != null">
       	kqbm = #{kqbm,jdbcType=VARCHAR},
       </if>
+      <if test="sfzk !=null">
+        sfzk = #{sfzk,jdbcType=VARCHAR},
+      </if>
     </set>
     where org_id = #{orgId,jdbcType=INTEGER}
   </update>
@@ -963,7 +977,8 @@
       wjl = #{wjl,jdbcType=LONGVARCHAR},
       frlxfs = #{frlxfs,jdbcType=VARCHAR},
       yxgr = #{yxgr,jdbcType=DECIMAL},
-      kqbm = #{kqbm,jdbcType=VARCHAR}
+      kqbm = #{kqbm,jdbcType=VARCHAR},
+      sfzk = #{sfzk,jdbcType=VARCHAR}
     where org_id = #{orgId,jdbcType=INTEGER}
   </update>
   <update id="updateOrgLevel" parameterType="map" statementType="CALLABLE" >

src/main/java/com/chinaitop/depot/system/mapper/UserInfoMapper.java

@@ -45,4 +45,26 @@ public interface UserInfoMapper {
     List<UserInfo> queryAllByOrgClass(Map<Object, Object> map);
 
 	List<UserInfo> getUserInfoByRole(Integer orgId);
+
+	/**
+     * 查询当前用户对应的员工信息
+     * 
+     * @param userId 员工ID
+     * @return
+     */
+    List<Map<String, Object>> findKeeper(@Param("userId") Integer userId);
+
+    /**
+     * 删除当前用对应的员工信息
+     * 
+     * @param userId 员工ID
+     */
+	void deleteKeeperObj(@Param("userId") Integer userId);
+
+	/**
+	 * 删除当前用户对应的员工所保管的仓房信息
+	 * 
+	 * @param keepid 员工ID集合
+	 */
+	void deleteKeeperHouseObj(@Param("keepid") Integer keepid);
 }

src/main/java/com/chinaitop/depot/system/mapper/UserInfoMapper.xml

@@ -558,4 +558,16 @@
 	) 
 	ORDER BY user_id 
   </select>
+  <!-- 查询当前用户对应的员工信息 -->
+  <select id="findKeeper" resultType="java.util.Map" parameterType="java.lang.Integer">
+	SELECT id FROM basic_keeper WHERE user_Id= ${userId}
+  </select>
+  <!-- 删除当前用户对应的员工信息 -->
+  <delete id="deleteKeeperObj" parameterType="java.lang.Integer">
+	delete FROM basic_keeper WHERE user_Id= ${userId}
+  </delete>
+  <!-- 删除当前用户对应的员工所保管的仓房信息 -->
+  <delete id="deleteKeeperHouseObj" parameterType="java.lang.Integer">
+	DELETE FROM basic_keeper_house WHERE keeper_id = ${keepid}
+  </delete>
 </mapper>

src/main/java/com/chinaitop/depot/system/model/OrgInfo.java

@@ -131,6 +131,8 @@ public class OrgInfo implements Serializable {
     
     private String kqbm;
 
+    private String sfzk;
+
     public Integer getOrgId() {
         return orgId;
     }
@@ -618,4 +620,12 @@ public class OrgInfo implements Serializable {
 	public void setKqbm(String kqbm) {
 		this.kqbm = kqbm == null ? null : kqbm.trim();
 	}
+
+	public String getSfzk() {
+		return sfzk;
+	}
+
+	public void setSfzk(String sfzk) {
+		this.sfzk = sfzk == null ? null : sfzk.trim();
+	}
 }

src/main/java/com/chinaitop/depot/system/service/UserInfoService.java

@@ -119,4 +119,12 @@ public interface UserInfoService {
 	List<UserInfo> queryAllByOrgClass(Map<Object, Object> map);
 
 	List<UserInfo> getUserInfoByRole(Integer orgId);
+
+	/**
+	 * 删除当前用户数据和当前用户关联的部分数据
+	 * 
+	 * @param userId
+	 * @throws Exception
+	 */
+	void deleteAll(Integer userId) throws Exception;
 }

src/main/java/com/chinaitop/depot/system/service/impl/UserInfoServiceImpl.java

@@ -12,7 +12,10 @@ import com.chinaitop.depot.system.model.UserInfoExample.Criteria;
 import com.chinaitop.depot.system.model.UserRole;
 import com.chinaitop.depot.system.model.UserRoleExample;
 import com.chinaitop.depot.system.service.UserInfoService;
+import com.chinaitop.depot.system.service.UserOrgService;
+
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -38,6 +41,9 @@ public class UserInfoServiceImpl implements UserInfoService {
 	@Resource
 	private RoleInfoMapper roleInfoMapper;
 
+	@Resource
+	private UserOrgService userOrgService;
+
 	@Override
 	public UserInfo valid(String UserInfoName, String password) {
 		// 获取MD5加密后的字符串
@@ -281,4 +287,30 @@ public class UserInfoServiceImpl implements UserInfoService {
 		return UserInfoMapper.getUserInfoByRole(orgId);
 	}
 
+	@Override
+	@Transactional
+	public void deleteAll(Integer userId) throws Exception {
+
+		UserInfoMapper.deleteByPrimaryKey(userId);//删除当前人
+		userRoleMapper.deleteById(userId);//删除用户角色信息
+		userOrgService.deleteById(userId);//删除用户机构权限信息
+
+		//删除用对应的员工信息
+		/* 查询当前用户对应的员工信息ID */
+		List<Map<String, Object>> list = UserInfoMapper.findKeeper(userId);
+
+		if (null != list && list.size() > 0) {
+			/* 删除当前用户对应的员工所保管的仓房信息 */
+			//Map<String, Object> map = null;
+			for (Map<String, Object> map : list) {
+				Integer id = Integer.parseInt(map.get("id")+"");
+				UserInfoMapper.deleteKeeperHouseObj(id);
+			}
+
+			/* 删除当前用户对应的员工信息 */
+			UserInfoMapper.deleteKeeperObj(userId);
+		}
+
+	}
+
 }