anderx лет назад: 4
Родитель
Сommit
2f45639e76

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

@@ -55,7 +55,7 @@ public interface NewAdminService {
 
 	Map<String, String> selectTechBroder();
 
-	int insertNewAdmin(Admin ad, List<String> roleIds);
+	Admin insertNewAdmin(Admin ad, List<String> roleIds);
 
 	Map<String, String> listAdminSelect();
 

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

@@ -188,35 +188,9 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 	}
 
 	@Override
-	public int insertNewAdmin(Admin ad ,List<String> roleIds) {
+	public Admin insertNewAdmin(Admin ad ,List<String> roleIds) {
 		ad.setStatus("正常");
 		ad.setId(UUID.randomUUID().toString());
-		/*String sdepNo=adminMapper.selectUserNoBySuperiorId(ad.getSuperiorId());
-		int Count=adminMapper.selectCountBySuperiorId(ad.getSuperiorId());
-		if(Count<10){
-			String dep=sdepNo+"0"+Count;
-			String sid=adminMapper.selectIdByUserNo(dep);
-			while(sid!=null){
-				Count=Count+1;				
-				if(Count>=10){
-					dep=sdepNo+Count;	
-				}else{
-					dep=sdepNo+"0"+Count;
-				}
-				sid=adminMapper.selectIdByUserNo(dep);				
-			}
-			ad.setUserNo(dep);
-		}
-		if(Count>=10){
-			String dep=sdepNo+Count;
-			String sid=adminMapper.selectIdByUserNo(dep);
-			while(sid!=null){
-				Count=Count+1;				
-				dep=sdepNo+Count;
-				sid=adminMapper.selectIdByUserNo(dep);				
-			}
-			ad.setUserNo(dep);
-		}	*/	
 		Map<String, Object> params = new HashMap<>();
 		params.put("uid", ad.getId());
 		params.put("roles", roleIds);
@@ -228,7 +202,8 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 			}
 			TokenManager.clearUserAuthByUserId(ad.getId());
 		}
-		return adminMapper.insertn(ad);
+		adminMapper.insertn(ad);
+		return ad;
 	}
 
 	@Override

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

@@ -820,7 +820,7 @@
   </select>
   
   <select id="selectPersonnelByList" resultType="com.goafanti.personnel.bo.OutPersonnelListBo">
- 	select a.id,a.door_id doorId,a.name,a.status,a.`system`,a.company,dep.name depName,a.marriage,a.job_nature jobNature,
+ 	select a.id,a.aid,a.door_id doorId,a.name,a.status,a.`system`,a.company,dep.name depName,a.marriage,a.job_nature jobNature,
 	a.job_nature_remarks jobNatureRemarks,b.jobs_name jobsName,a.lvl,b.lvl_name starName,date_format(a.entry_time,'%Y-%m-%d')entryTimes,
 	date_format(a.promotion_time,'%Y-%m-%d')promotionTimes,date_format(a.birthday,'%Y-%m-%d')birthdays,
 	a.entry_time entryTime, a.sex,a.son,a.girl,a.political_outlook politicalOutlook,d.education,

+ 0 - 1
src/main/java/com/goafanti/core/shiro/filter/AdminFilter.java

@@ -24,7 +24,6 @@ public class AdminFilter extends AccessControlFilter {
 	@Override
 	protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue)
 			throws Exception {
-
 		AftUser token = TokenManager.getToken();
 		if (token instanceof Admin) {
 			return Boolean.TRUE;

+ 1 - 1
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -112,7 +112,7 @@ public class AdminOrganizationController extends BaseApiController{
 		if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
 				|| StringUtils.isBlank(managerId)|| StringUtils.isBlank(superId)
 				|| StringUtils.isBlank(status)|| StringUtils.isBlank(remarks)){
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,""));
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"",""));
 			return res;
 		}		
 		String sdepNo=organizationManagementMapper.selectDepNo(superId);//No

+ 7 - 0
src/main/java/com/goafanti/personnel/bo/OutPersonnelListBo.java

@@ -6,6 +6,7 @@ import java.util.Date;
 public class OutPersonnelListBo {
 	private Integer id;
 	private Integer doorId;
+	private String aid;
 	private String name;
 	private Integer status;
 	private Integer system;
@@ -602,6 +603,12 @@ public class OutPersonnelListBo {
 	public void setEmployeeId(Integer employeeId) {
 		this.employeeId = employeeId;
 	}
+	public String getAid() {
+		return aid;
+	}
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
 	
 	
 }

+ 7 - 2
src/main/resources/props/config_local.properties

@@ -68,13 +68,18 @@ avatar.upload.host=//sb.jishutao.com/upload
 #avatar.host=//sb.jishutao.com
 
 #连测试
-avatar.host=//static.jishutao.com
+#avatar.host=//static.jishutao.com
 #static.host=//static.jishutao.com/1.1.65
-static.host=//172.16.0.253/1.1.65
+avatar.host=//172.16.0.188:3000/
+#static.host=//172.16.0.253/1.1.65
+static.host=//172.16.0.188:3000/static/1.1.65
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload
 
+#upload.path=D:/git/basics-server/src/main/webapp/static/upload
+#upload.private.path=D:/git/basics-server/src/main/webapp/static/upload
+
 accessKey=LTAIqTgQLLwz252Z
 accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
 aesSecretKey=aft1234567890123

+ 3 - 5
src/main/resources/spring/spring-mvc.xml

@@ -51,11 +51,9 @@
 	</bean>
 
 
-	<!-- Handles HTTP GET requests for /assets/** by efficiently serving up 
-		static resources in the ${webappRoot}/assets directory -->
-	<mvc:resources mapping="/static/images/**" location="/WEB-INF/images/" />
-	<mvc:resources mapping="/static/html/**" location="/WEB-INF/html/" />
-	<mvc:resources mapping="/static/**" location="/WEB-INF/dist/" />
+
+	
+	<mvc:resources mapping="/static/**" location="/static/" />
 	<mvc:resources mapping="/favicon.ico" location="/WEB-INF/assets/favicon.ico" />
 	<mvc:resources mapping="/robots.txt" location="/WEB-INF/assets/robots.txt" />
 	

+ 22 - 3
src/main/webapp/WEB-INF/web.xml

@@ -1,5 +1,7 @@
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+	version="3.1">
 		
 	<display-name>basics</display-name>
 
@@ -17,7 +19,7 @@
 	
 	<filter>
 		<filter-name>CorsFilter</filter-name>
-		<filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
+		<filter-class>org.apache.catalina.filters.CorsFilter</filter-class> 
 		<async-supported>true</async-supported>
 	</filter>
 	<filter-mapping>
@@ -25,6 +27,7 @@
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 	<filter>
+	
 		<filter-name>encodingFilter</filter-name>
 		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
 		<async-supported>true</async-supported>
@@ -101,6 +104,22 @@
 	</servlet-mapping> -->
 	<!-- url -->
 	<servlet-mapping>
+	    <servlet-name>default</servlet-name>
+	    <url-pattern>*.jpg</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+	    <servlet-name>default</servlet-name>
+	    <url-pattern>*.png</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+	    <servlet-name>default</servlet-name>
+	    <url-pattern>*.js</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+	    <servlet-name>default</servlet-name>
+	    <url-pattern>*.css</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
 		<servlet-name>aft</servlet-name>
 		<url-pattern>/</url-pattern>
 	</servlet-mapping>