Просмотр исходного кода

Merge branch 'test' of jishutao/aft into prod

gitadmin лет назад: 7
Родитель
Сommit
350ec0c489

+ 1 - 1
src/main/java/com/goafanti/admin/bo/AdminListBo.java

@@ -111,7 +111,7 @@ public class AdminListBo {
 	}
 
 	public String getUserNo() {
-		return userNo;
+		return null;
 	}
 
 	public void setUserNo(String userNo) {

+ 3 - 5
src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java

@@ -165,7 +165,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 				return res;	
 			}
 			//*********用户编号判断**************
-			String sdepNo=adminMapper.selectUserNoBySuperiorId(admin.getSuperiorId());
+			/*String sdepNo=adminMapper.selectUserNoBySuperiorId(admin.getSuperiorId());
 			int Count=adminMapper.selectCountBySuperiorId(admin.getSuperiorId());
 			if((Count+1)>99){
 				res.getError().add(buildError("","每层最多存在99个子类"));
@@ -194,7 +194,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 					sid=adminMapper.selectIdByUserNo(dep);				
 				}
 				admin.setUserNo(dep);
-			}
+			}*/
 			
 			Admin ad = new Admin();
 			BeanUtils.copyProperties(admin, ad);
@@ -202,9 +202,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 			if (!res.getError().isEmpty()) {
 				return res;
 			}
-		
-			
-			res.setData(newAdminService.updateByPrimaryKeySelective(ad, roles));
+		res.setData(newAdminService.updateByPrimaryKeySelective(ad, roles));
 		}
 		
 	

+ 4 - 4
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -93,7 +93,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 		String autNo;
 		int n=0;
 		List<Admin> Nos =adminMapper.selectIDNBySuperiorId(ad.getId());
-		for(Admin i:Nos){			
+		/*for(Admin i:Nos){			
 			autNo=adminMapper.selectUserNoById(i.getSuperiorId());
 			if(n<10){
 				String aut=autNo+"0"+n;			
@@ -155,7 +155,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 					z++;
 				}
 			}
-		}
+		}*/
 		return count;
 	}
 
@@ -257,7 +257,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 		ad.setStatus("正常");		
 		String sdepNo=adminMapper.selectUserNoBySuperiorId(ad.getSuperiorId());
 		int Count=adminMapper.selectCountBySuperiorId(ad.getSuperiorId());
-		if(Count<10){
+		/*if(Count<10){
 			String dep=sdepNo+"0"+Count;
 			String sid=adminMapper.selectIdByUserNo(dep);
 			while(sid!=null){
@@ -280,7 +280,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 				sid=adminMapper.selectIdByUserNo(dep);				
 			}
 			ad.setUserNo(dep);
-		}		
+		}	*/	
 		Map<String, Object> params = new HashMap<>();
 		params.put("uid", ad.getId());
 		params.put("roles", roleIds);

+ 2 - 2
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -235,8 +235,8 @@ public class WebpageController extends BaseController {
 		List<MarketingManagementBo> demandList = marketingManagementService.selectMarketList(request,
 				MarketingPage.mainDemand.getBoothType(),MarketingPage.mainDemand.getBoothSize());
 		List<MarketingManagementBo> speciaList = marketingManagementService.selectMarketList(request,
-				MarketingPage.specialist.getBoothType(), MarketingPage.specialist.getBoothSize());*/
-		/*modelview.addObject("achievementList", achievementList);
+				MarketingPage.specialist.getBoothType(), MarketingPage.specialist.getBoothSize());
+		modelview.addObject("achievementList", achievementList);
 		modelview.addObject("demandList", demandList);
 		modelview.addObject("speciaList", speciaList);
 		modelview.addObject("projectList", projectList);*/

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

@@ -714,7 +714,8 @@
   <!--*************************************************************************-->
   <select id="selectAdminListByPage" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
   	select x.*,y.name as departmentName from(select 
-   		 a.user_no as userNo, a.mobile, a.name, 
+   		 <!-- a.user_no as userNo, -->
+   		  a.mobile, a.name, 
    		 a.position, a.email, a.id,
    		 a.province,
    		 a.city,

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

@@ -1063,7 +1063,7 @@
 			a.finance_id = d.id left join admin e on
 			a.technician_id = e.id left join department f on 
 			c.department_id = f.id
-		where a.order_type = 0
+		where a.order_type = 0 and a.delete_sign=0
 		<if test="orderNo != null">
 			and a.order_no= #{orderNo,jdbcType=VARCHAR}
 		</if>

+ 1 - 1
src/main/java/com/goafanti/common/model/Admin.java

@@ -158,7 +158,7 @@ public class Admin extends BaseModel implements AftUser {
 	}
 
 	public String getUserNo() {
-		return userNo;
+		return null;
 	}
 
 	public void setUserNo(String userNo) {