anderx 4 år sedan
förälder
incheckning
ea55413339

+ 3 - 0
src/main/java/com/goafanti/common/dao/UserChannelMapper.java

@@ -74,6 +74,9 @@ public interface UserChannelMapper {
 	List<String> checkRecovery(List<String> list);
 
 
+	void deleteUser(List<String> list);
+
+
 	
 
 

+ 13 - 0
src/main/java/com/goafanti/common/mapper/UserChannelMapper.xml

@@ -261,6 +261,19 @@
     </foreach>
     )
     </delete>
+   <delete id="deleteUser">
+        delete user_channel ,user , organization_identity ,organization_contact_book 
+	    from user_channel ,user , organization_identity ,organization_contact_book
+	    where user_channel.id in (
+	     <foreach collection="list" index="index" item="item" separator=",">
+      #{item}
+    </foreach>
+    ) 
+	    and user_channel.uid =user.id and user.status =1
+	    and user.id=organization_identity.uid and user.id=organization_contact_book.uid 
+     
+    </delete>
+    
     <select id="checkRecovery" resultType="java.lang.String">
     select recovery from user_channel where uid in (
       <foreach collection="list" index="index" item="item" separator=",">

+ 0 - 1
src/main/java/com/goafanti/common/utils/ExcelUtils.java

@@ -38,7 +38,6 @@ import java.net.URLEncoder;
 import java.util.*;
 import java.util.regex.Matcher;
 
-@Component
 public class ExcelUtils {
 	private Set<Integer> vacantRows = new HashSet<Integer>(); //数据不完整的
 	private final String DEFAULT_MOBILE = "0000-0000000";

+ 10 - 11
src/main/java/com/goafanti/user/service/impl/UserChannelServiceImpl.java

@@ -182,17 +182,16 @@ public class UserChannelServiceImpl extends BaseMybatisDao<UserChannelMapper> im
 		        in.setShareType(0);
 		        in.setPassword(passwordUtil.getEncryptPwd("123456", now.getTime()));
 		        User u=userMapper.selectByName(in.getUserName());
-		        if (u==null) {
+		        if (checkUserName(in.getUserName())) {
+		        	in.setUid(uid);
+		        	in.setStatus(ChannelStatus.FFMC.getCode());
+					in.setUserStatus(1);
+					list3.add(in);
+				} else if (u == null) {
 					in.setUid(uid);
-					if (checkUserName(in.getUserName())) {
-						in.setStatus(ChannelStatus.FFMC.getCode());
-						in.setUserStatus(1);
-						list3.add(in);
-					}else {
-						in.setUserStatus(0);
-						in.setStatus(ChannelStatus.WFP.getCode());
-						list.add(in);
-					}
+					in.setUserStatus(0);
+					in.setStatus(ChannelStatus.WFP.getCode());
+					list.add(in);
 				}else {
 //					共享类型 0-私有 1-公共 2 签单
 					if(u.getShareType()==0)in.setStatus(ChannelStatus.YCZSY.getCode());
@@ -280,7 +279,7 @@ public class UserChannelServiceImpl extends BaseMybatisDao<UserChannelMapper> im
 	public Object delete(String ids) {
 		String [] str=ids.split(",");
 		List<String> list=Arrays.asList(str);
-		
+		userChannelMapper.deleteUser(list);
 		return userChannelMapper.deleteByIds(list);
 	}