|
|
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import com.alibaba.druid.sql.ast.statement.SQLIfStatement.Else;
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
@@ -192,6 +193,12 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
public Pagination<CustomerListOut> listAllOrganizationCustomer(CustomerListIn cli, Integer pageNo,Integer pageSize) {
|
|
|
cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
|
|
|
Map<String,Object> params = disposeParams(cli);
|
|
|
+ if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
|
|
|
+ params.put("role", 1);
|
|
|
+ }else {
|
|
|
+ params.put("role", 0);
|
|
|
+ }
|
|
|
+
|
|
|
Pagination<CustomerListOut> p=(Pagination<CustomerListOut>) findPage("selectOrganizationCustomerList","selectOrganizationCustomerCount",params,pageNo,pageSize);
|
|
|
List<CustomerListOut> l=(List<CustomerListOut>) p.getList();
|
|
|
for (CustomerListOut c : l) {
|
|
|
@@ -1533,11 +1540,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
LockingReleaseBo l=list.get(0);
|
|
|
UserLockRelease ul=new UserLockRelease();
|
|
|
ul.setId(l.getId());
|
|
|
- ul.setStatus(2);
|
|
|
- ul.setReleaseTime(now);
|
|
|
+// 不做释放与锁定的动作
|
|
|
+// ul.setStatus(2);
|
|
|
+ ul.setAid(inputId);
|
|
|
+// 不修改时间
|
|
|
+// ul.setReleaseTime(now);
|
|
|
userLockReleaseMapper.updateByPrimaryKeySelective(ul);
|
|
|
addtransferLog(uid,pid,TokenManager.getAdminId(),inputId,1);
|
|
|
- addUserLock(uid,inputId,1,pid,now); //指定用户锁定客户
|
|
|
+// addUserLock(uid,inputId,1,pid,now); //指定用户锁定客户
|
|
|
List<BusinessListBo> bl=userBusinessMapper.selectBusinessProjectByUAPid(uid, TokenManager.getAdminId(), pid);
|
|
|
if (bl.size()==1) {
|
|
|
UserBusiness ub=new UserBusiness();
|