Merge remote-tracking branch 'origin/kako' into kako

@@ -10,17 +10,17 @@ import org.springframework.stereotype.Service;
 
 
 import java.util.List;
 import java.util.List;
 
 
-@Service
+@Service(value = "kakoUserService")
 public class KakoUserDetailService implements UserDetailsService {
 public class KakoUserDetailService implements UserDetailsService {
 
 
     @Autowired
     @Autowired
-    private KakoUserService userService;
+    private KakoUserService kakoUserService;
 
 
     @Override
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
 
 
 
 
-        UserDetails user = userService.loadByUsername(username);
+        UserDetails user = kakoUserService.loadByUsername(username);
         if (user == null) {
         if (user == null) {
             throw new UsernameNotFoundException("用户名不存在");
             throw new UsernameNotFoundException("用户名不存在");
 //            throw new BadCredentialsException("用户名不存在");
 //            throw new BadCredentialsException("用户名不存在");

@@ -40,6 +40,7 @@
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
     from sys_user
     from sys_user
     WHERE  1=1
     WHERE  1=1
+    and del_flag= '0'
     <if test=" loginName != null" >
     <if test=" loginName != null" >
       and  login_name = #{loginName,jdbcType=VARCHAR}
       and  login_name = #{loginName,jdbcType=VARCHAR}
     </if>
     </if>
@@ -54,7 +55,8 @@
     where login_name = #{login_name,jdbcType=VARCHAR}
     where login_name = #{login_name,jdbcType=VARCHAR}
   </select>
   </select>
   <update id="deleteByPrimaryKey" parameterType="java.lang.String" >
   <update id="deleteByPrimaryKey" parameterType="java.lang.String" >
-    update from sys_user
+    update sys_user
+    set
     del_flag = '1'
     del_flag = '1'
     where id = #{id,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   </update>