|
|
@@ -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);
|
|
|
}
|
|
|
|