liupeng 5 years ago
parent
commit
afc0fe3cab

+ 2 - 0
code/sapparent/sapservice/src/main/java/org/fouram/constants/WebConstants.java

@@ -26,4 +26,6 @@ public final class WebConstants {
 	public static final String ORG2 = "FODivision";
 	public static final String ORG3 = "FODepartment";
 	public static final String ORG4 = "cust_org4";
+	
+	public static final String OPRTYPE_DELETE = "DELETE";
 }

+ 26 - 0
code/sapparent/sapservice/src/main/java/org/fouram/entity/SapOprLog.java

@@ -0,0 +1,26 @@
+package org.fouram.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import org.apache.ibatis.type.Alias;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Alias(value = "SapOprLog")
+public class SapOprLog implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String id;
+	private String content;
+	private String oprType;
+	private String oprUserId; 
+	private Date createDate;
+}

+ 8 - 0
code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapOprLogMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="SapOprLogMapper">
+	<insert id="saveOne">
+		insert into sap_opr_log(content,oprType,oprUserId,createDate) 
+		values (#{content},#{oprType},#{oprUserId},#{createDate})
+	</insert>
+</mapper>

+ 4 - 0
code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapUserMapper.xml

@@ -98,4 +98,8 @@
 		</if>
 		order by sortNumber ASC
 	</select>
+	
+	<delete id="deleteByUserId">
+		delete from sap_user where userId=#{userId} 
+	</delete>
 </mapper>

+ 17 - 0
code/sapparent/sapservice/src/main/java/org/fouram/service/SapOprLogService.java

@@ -0,0 +1,17 @@
+package org.fouram.service;
+
+import java.util.Date;
+
+import org.fouram.core.base.service.BaseService;
+import org.fouram.entity.SapOprLog;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SapOprLogService extends BaseService {
+
+	public void saveOne(String content, String oprType, String oprUserId) throws Exception {
+		SapOprLog entity = SapOprLog.builder().content(content).oprType(oprType).oprUserId(oprUserId)
+				.createDate(new Date()).build();
+		save("SapOprLogMapper.saveOne", entity);
+	}
+}

+ 17 - 4
code/sapparent/sapservice/src/main/java/org/fouram/service/SapUserService.java

@@ -11,6 +11,7 @@ import org.fouram.core.base.service.BaseService;
 import org.fouram.core.base.service.RequestService;
 import org.fouram.core.plugin.weixin.cp.util.WXCpUserUtil;
 import org.fouram.core.util.Base64Util;
+import org.fouram.core.util.JSONUtil;
 import org.fouram.core.util.JsonNodeUtil;
 import org.fouram.core.util.Tools;
 import org.fouram.entity.SapOrg;
@@ -32,6 +33,8 @@ public class SapUserService extends BaseService {
 	@Autowired
 	private SapEmpJobService sapEmpJobService;
 	@Autowired
+	private SapOprLogService sapOprLogService;
+	@Autowired
 	private SapPersonalService sapPersonalService;
 
 	private static boolean isTestWXSync = true;
@@ -193,8 +196,8 @@ public class SapUserService extends BaseService {
 		SapOrg sapOrg = sapOrgService.selectById(departId);
 		if (StringUtils.isBlank(departId) || WebConstants.TOP_DEPART.toString().equals(departId)) {
 			departId = WebConstants.TOP_DEPART.toString();
-			sapOrg = SapOrg.builder().id(WebConstants.TOP_DEPART.toString()).sapName(WebConstants.TOP_DEPART_NAME).level("1")
-					.build();
+			sapOrg = SapOrg.builder().id(WebConstants.TOP_DEPART.toString()).sapName(WebConstants.TOP_DEPART_NAME)
+					.level("1").build();
 		}
 		PageData pd = new PageData();
 		pd.put("departId", departId);
@@ -243,9 +246,19 @@ public class SapUserService extends BaseService {
 	public void updateAvatar(SapUser sapUser) throws Exception {
 		update("SapUserMapper.updateAvatar", sapUser);
 	}
+	
+	public void deleteByUserId(String userId) throws Exception {
+		update("SapUserMapper.deleteByUserId", userId);
+	}
 
 	public void deleteQuitUserByUserId(String userId, String oprUserId) throws Exception {
-//		SapUser sapUser = selectByUserId(userId);
-//		WXCpUserUtil.delete(sapUser.getPersonId());
+		SapUser sapUser = selectByUserId(userId);
+		String personId = sapUser.getPersonId();
+		List<SapUser> sapUsers = selectListByPersonId(personId);
+		for(SapUser user : sapUsers) {
+			deleteByUserId(user.getUserId());
+		}
+		WXCpUserUtil.delete(personId);
+		sapOprLogService.saveOne(JSONUtil.toString(sapUsers), WebConstants.OPRTYPE_DELETE, oprUserId);
 	}
 }