Browse Source

合并冲突

zou_ht 8 years ago
parent
commit
5538c1f703

+ 11 - 0
src/main/java/com/goafanti/customer/service/CustomerLogoService.java

@@ -0,0 +1,11 @@
+package com.goafanti.customer.service;
+
+import com.goafanti.common.model.CustomerLog;
+
+public interface CustomerLogoService {
+	/**
+	 * 添加操作日志
+	 * @param cLog
+	 */
+	public void saveLogo(CustomerLog cLog);
+}

+ 5 - 0
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -10,7 +10,12 @@ public interface CustomerService {
 	
 	void deleteCustomer(String id);
 	
+
 	CustomerBo selectCustomerByPrimaryKey (String id);
 	
 	void updCustomerByByPrimaryKey(String id);
+
+	//查询用户的管理层ID
+	String findLadderIds(String userId);
+
 }

+ 19 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -6,17 +6,24 @@ import org.springframework.stereotype.Service;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.customer.bo.CustomerBo;
 import com.goafanti.customer.service.CustomerService;
+import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.CustomerMapper;
+import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Customer;
+import com.goafanti.common.utils.StringUtils;
 @Service
 public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implements CustomerService {
 	@Autowired
 	private CustomerMapper customerMapper ;
+	@Autowired
+	private AdminMapper adminMapper;
+	
 	@Override
 	public int addCustomer(Customer cus) {
 		int res = customerMapper.insertCustomer(cus);
 		return res;
 	}
+
 	@Override
 	public void deleteCustomer(String id) {
 		customerMapper.deleteCustomerByPrimaryKey(id);
@@ -27,4 +34,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 		return null;
 	}
 	
+	@Override
+	public String findLadderIds(String adminId) {
+		String result = "";
+		Admin admin = adminMapper.selectByPrimaryKey(adminId);
+		if(admin != null && StringUtils.isNotBlank(admin.getSuperiorId())){
+			result += admin.getSuperiorId() + ",";
+			result += findLadderIds(admin.getSuperiorId());
+		}
+		if(!result.equals("")) result = result.substring(0, result.length()-1);
+		return result;
+	}
+	
 }