Browse Source

修改管理员层级关系

wanghui 8 years ago
parent
commit
da3f659188

+ 14 - 4
src/main/java/com/goafanti/admin/controller/AdminSuperviseApiController.java

@@ -29,6 +29,7 @@ import com.goafanti.common.model.AdminLocation;
 import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.customer.service.CustomerService;
 import com.goafanti.user.service.UserService;
 
 @Controller
@@ -42,7 +43,8 @@ public class AdminSuperviseApiController extends CertifyApiController {
 	private AdminLocationService	adminLocationService;
 	@Resource
 	private UserService				userService;
-
+	@Resource
+	private CustomerService			customerService;
 	/**
 	 * 审核人员、客户经理、营销经理检索全部客户名称
 	 */
@@ -211,11 +213,16 @@ public class AdminSuperviseApiController extends CertifyApiController {
 			}
 
 			Admin a = adminService.selectByPrimaryKey(admin.getId());
-
-			if (null == a) {
-				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
+			boolean updateCustomer = false;	//是否修改客户表层级关系
+			if (null == a) {	
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));				
 				return res;
+				
 			}
+			if(StringUtils.isNotBlank(a.getSuperiorId())&&StringUtils.isBlank(admin.getSuperiorId())) updateCustomer = true;
+			if(StringUtils.isBlank(a.getSuperiorId())&&StringUtils.isNotBlank(admin.getSuperiorId())) updateCustomer = true;
+			if(StringUtils.isNotBlank(a.getSuperiorId())&&StringUtils.isNotBlank(admin.getSuperiorId())
+					&&!a.getSuperiorId().equals(admin.getSuperiorId())) updateCustomer = true;
 			Admin ad = new Admin();
 			BeanUtils.copyProperties(admin, ad);
 			res = disposeAdminLocationList(res, jo, ad);
@@ -230,6 +237,9 @@ public class AdminSuperviseApiController extends CertifyApiController {
 				}
 			}
 			res.setData(adminService.updateByPrimaryKeySelective(ad, roles, adminLocationList));
+			if(updateCustomer){
+				customerService.updateLadderIds(admin.getId());
+			}
 		}
 		return res;
 	}

+ 1 - 1
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -16,6 +16,7 @@ import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminLocationMapper;
 import com.goafanti.common.dao.AdminMapper;
+import com.goafanti.common.dao.CustomerMapper;
 import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.AdminLocation;
@@ -33,7 +34,6 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	private UserRoleMapper		userRoleMapper;
 	@Autowired
 	private AdminLocationMapper	adminLocationMapper;
-
 	@Override
 	public List<Admin> selectAllAdmin() {
 		return adminMapper.selectAllAdmin();

+ 1 - 1
src/main/java/com/goafanti/common/mapper/CustomerMapper.xml

@@ -566,6 +566,6 @@
   	select 
     <include refid="Base_Column_List" />
     from customer
-    where paid like concat('%',#{paid},'%')
+    where aid = #{paid} paid like concat('%',#{paid},'%')
   </select>
 </mapper>

+ 7 - 2
src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html

@@ -129,9 +129,14 @@
 		 			</ol>
 				</div>
 			</div>
-			<div class="main_introduce">
+			<div class="demandList">
+				<ol>
+					<li>行业</li>
+					<li>名称</li>
+					<li>类型</li>
+					<li>预算</li>
+				</ol>
 				<ul>
-					
 				</ul>
 			</div>
 			<div class="container pagination_box">