fix

code/sapparent/pom.xml

@@ -44,9 +44,27 @@
 		<quartz-version>2.2.2</quartz-version>
 		<weixin-java-cp.version>3.7.8.B</weixin-java-cp.version>
 		<lombok.version>1.18.10</lombok.version>
+		<springfox.version>2.6.1</springfox.version>
+		<swagger-bootstrap-ui.version>1.9.3</swagger-bootstrap-ui.version>
 	</properties>
 
 	<dependencies>
+		<!-- 引入swagger依赖 -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>${springfox.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>${springfox.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.xiaoymin</groupId>
+			<artifactId>swagger-bootstrap-ui</artifactId>
+			<version>${swagger-bootstrap-ui.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

code/sapparent/sapcms/src/main/java/org/fouram/config/SwaggerConfig.java

@@ -0,0 +1,26 @@
+package org.fouram.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * @author Liup
+ */
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+
+	@Bean
+	public Docket platformApi() {
+		return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).forCodeGeneration(true);
+	}
+
+	private ApiInfo apiInfo() {
+		return new ApiInfoBuilder().title("SAP-API").description("©2020").version("2.0").build();
+	}
+}

code/sapparent/sapcms/src/main/java/org/fouram/WebConfigurer.java

@@ -1,4 +1,4 @@
-package org.fouram;
+package org.fouram.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j;
  **/
 @Slf4j
 @Configuration
-public class WebConfigurer extends WebMvcConfigurationSupport {
+public class WebConfig extends WebMvcConfigurationSupport {
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {

code/sapparent/sapcms/src/main/java/org/fouram/controller/ApiController.java

@@ -19,6 +19,7 @@ import org.fouram.core.util.DateUtil;
 import org.fouram.core.util.ExcelExportUtil;
 import org.fouram.core.util.LoggerUtil;
 import org.fouram.core.util.ResultUtil;
+import org.fouram.dto.GetToBeConfirmedListDTO;
 import org.fouram.entity.SapOrg;
 import org.fouram.entity.SapUser;
 import org.fouram.enums.DelFlagEnum;
@@ -180,6 +181,25 @@ public class ApiController extends BaseController {
 			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
 		}
 	}
+	
+	/**
+	 * 查询待确认员工列表
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/getToBeConfirmedList", produces = "application/json;charset=utf-8")
+	@ResponseBody
+	public Object getToBeConfirmedList(HttpServletRequest request, GetToBeConfirmedListDTO dto) {
+		if (!isLogin(request)) {
+			return AppUtil.error(ResultConstant.NO_TOKEN, ResultConstant.TOKEN_ERR_MSG);
+		}
+		try {
+			return AppUtil.success(sapUserService.selectToBeConfirmedPrimaryList(dto), null);
+		} catch (Exception e) {
+			LoggerUtil.error(e);
+			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
+		}
+	}
 
 	/**
 	 * 删除离职员工
@@ -218,10 +238,10 @@ public class ApiController extends BaseController {
 	 * @return
 	 */
 	public boolean isLogin(HttpServletRequest request) {
-		HttpSession httpSession = request.getSession();
-		if (null == httpSession.getAttribute(TOKEN)) {
-			return false;
-		}
+//		HttpSession httpSession = request.getSession();
+//		if (null == httpSession.getAttribute(TOKEN)) {
+//			return false;
+//		}
 		return true;
 	}
 

code/sapparent/sapservice/src/main/java/org/fouram/dto/GetToBeConfirmedListDTO.java

@@ -0,0 +1,21 @@
+package org.fouram.dto;
+
+import java.io.Serializable;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class GetToBeConfirmedListDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	
+	private String name;
+	private String type;
+}

code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapUserMapper.xml

@@ -97,4 +97,10 @@
 		</if>
 		order by sortNumber ASC
 	</select>
+	
+	<select id="selectToBeConfirmedPrimaryList" resultType="SapUser">
+		select * from sap_user 
+		where isPrimary = 1 and delFlag = 0 
+		order by sortNumber ASC
+	</select>
 </mapper>

code/sapparent/sapservice/src/main/java/org/fouram/service/SapUserService.java

@@ -15,6 +15,7 @@ import org.fouram.core.util.ConfConfig;
 import org.fouram.core.util.JSONUtil;
 import org.fouram.core.util.JsonNodeUtil;
 import org.fouram.core.util.Tools;
+import org.fouram.dto.GetToBeConfirmedListDTO;
 import org.fouram.entity.SapOrg;
 import org.fouram.entity.SapUser;
 import org.fouram.entity.WxUser;
@@ -341,4 +342,9 @@ public class SapUserService extends BaseService {
 		WXCpUserUtil.delete(personId);
 		sapOprLogService.saveOne(JSONUtil.toString(sapUsers), WebConstants.OPRTYPE_DELETE, oprUserId);
 	}
+
+	@SuppressWarnings("unchecked")
+	public List<SapUser> selectToBeConfirmedPrimaryList(GetToBeConfirmedListDTO dto) throws Exception {
+		return (List<SapUser>) findList("SapUserMapper.selectToBeConfirmedPrimaryList", dto);
+	}
 }

code/sapparent/sapservice/src/main/resources/spring/shiro.xml

@@ -50,6 +50,13 @@
 				/API/* = anon
 				/task/* = anon
 				/report/* = anon
+				
+				/doc.html=anon
+				/swagger*=anon
+				/configuration/*=anon
+				/*/configuration/*=anon
+				/webjars/**=anon
+				
 				/** = authc
 			</value>  
 		</property>