Merge branch 'master-tiande' into dev-tiande

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/BaseUserDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import com.github.wxiaoqi.security.common.vo.DataInter;
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/8 16:08
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BaseUserDTO extends PageParam implements DataInter {
+
+    @ApiModelProperty("企业id")
+    Integer corporationId;
+
+    @ApiModelProperty("公司id")
+    Integer companyId;
+
+
+    @ApiModelProperty("名称")
+    String name;
+
+    List<Integer> dataCorporationIds;
+
+    List<Integer> dataCompanyIds;
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BranchCompanyBiz.java

@@ -19,7 +19,8 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
 
     public ObjectRestResponse addOrUpd(BranchCompany branchCompany){
         Long id = branchCompany.getId() == null ? 0L :branchCompany.getId();
-        if (id > 0L){
+        BranchCompany branchCompany1=selectById(id);
+        if (branchCompany1 != null){
              updateSelectiveById(branchCompany);
         }else {
              insertSelective(branchCompany);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/CompanyInfoBiz.java

@@ -29,7 +29,8 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
 
     public ObjectRestResponse addOrUpd(CompanyInfo companyInfo){
         Long id = companyInfo.getId() == null ? 0L :companyInfo.getId();
-        if (id > 0L){
+        CompanyInfo companyInfo1=selectById(id);
+        if (companyInfo1 != null){
              updateSelectiveById(companyInfo);
         }else {
              insertSelective(companyInfo);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBiz.java

@@ -4,6 +4,7 @@ import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.wxiaoqi.security.admin.dto.BaseUserDTO;
 import com.github.wxiaoqi.security.admin.entity.User;
 import com.github.wxiaoqi.security.admin.mapper.MenuMapper;
 import com.github.wxiaoqi.security.admin.mapper.UserMapper;
@@ -14,6 +15,7 @@ import com.github.wxiaoqi.security.common.constant.UserConstant;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.entity.CompanyInfo;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
@@ -181,4 +183,15 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
     public User getUserByUid(Integer userId){
         return mapper.selectByPrimaryKey(userId);
     }
+
+
+    public List<BaseUserVo> getList(BaseUserDTO baseUserDTO){
+        return  mapper.selectList(baseUserDTO);
+    }
+    public ObjectRestResponse selectList(BaseUserDTO baseUserDTO){
+        Integer page=baseUserDTO.getPage()==null?1:baseUserDTO.getPage();
+        Integer limit=baseUserDTO.getLimit()==null?10:baseUserDTO.getLimit();
+        PageDataVO<BaseUserVo> dataVO= PageDataVO.pageInfo(page, limit, ()->getList(baseUserDTO));
+        return  ObjectRestResponse.succ(dataVO);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/UserMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
+import com.github.wxiaoqi.security.admin.dto.BaseUserDTO;
 import com.github.wxiaoqi.security.admin.entity.User;
+import com.github.wxiaoqi.security.admin.vo.BaseUserVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -11,4 +13,6 @@ public interface UserMapper extends Mapper<User> {
     public List<User> selectLeaderByGroupId(@Param("groupId") int groupId);
 //    public List<User> userPage(@Param("groupId") String name);
    User getUserByUid(@Param("to_uid") Integer to_uid);
+
+   List<BaseUserVo> selectList(BaseUserDTO baseUserDTO);
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserController.java

@@ -3,9 +3,12 @@ package com.github.wxiaoqi.security.admin.rest;
 import com.github.wxiaoqi.security.admin.biz.GroupBiz;
 import com.github.wxiaoqi.security.admin.biz.MenuBiz;
 import com.github.wxiaoqi.security.admin.biz.UserBiz;
+import com.github.wxiaoqi.security.admin.dto.BaseUserDTO;
 import com.github.wxiaoqi.security.admin.entity.Menu;
 import com.github.wxiaoqi.security.admin.entity.User;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.admin.rpc.service.PermissionService;
 import com.github.wxiaoqi.security.admin.vo.BaseUserVo;
 import com.github.wxiaoqi.security.admin.vo.FrontUser;
@@ -40,7 +43,7 @@ import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.
 @Slf4j
 @RestController
 @RequestMapping("user")
-public class UserController extends CommonBaseController {
+public class UserController extends CommonBaseController implements UserRestInterface {
 
     public final static Integer CURRENT_COMPANY = 1;
     public final static Integer CURRENT_ZONE = 2;
@@ -64,6 +67,14 @@ public class UserController extends CommonBaseController {
     @Autowired
     private UserAuthConfig userAuthConfig;
 
+    @Autowired
+    UserFeign userFeign;
+
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
     //内部类
 
     @Data
@@ -146,15 +157,21 @@ public class UserController extends CommonBaseController {
         return menuBiz.selectListAll();
     }
 
-    @RequestMapping(value = "/page",method = RequestMethod.GET)
+   /* @RequestMapping(value = "/page",method = RequestMethod.GET)
     @ResponseBody
     public TableResultResponse<BaseUserVo> list(@RequestParam Map<String, Object> params)throws Exception{
         //查询列表数据
         Query query = new Query(params);
         return userBiz.selectPage(query, userBiz.getUserByUsername(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getUniqueName()));
+    }*/
+    @RequestMapping(value = "/page",method = RequestMethod.GET)
+    public ObjectRestResponse selectLList(BaseUserDTO baseUserDTO){
+        setPowerData(baseUserDTO,true);
+        return userBiz.selectList(baseUserDTO);
     }
 
 
+
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ResponseBody
     public ObjectRestResponse<User> get(@PathVariable int id) {

ace-modules/ace-admin/src/main/resources/mapper/UserMapper.xml

@@ -60,4 +60,44 @@
 <!--                      left join  base_group_leader gm-->
 <!--                                 on gm.user_id = u.id where gm.group_id = #{groupId}-->
 <!--  </select>-->
+  <select id="selectList" parameterType="com.github.wxiaoqi.security.admin.dto.BaseUserDTO" resultType="com.github.wxiaoqi.security.admin.vo.BaseUserVo">
+    SELECT
+    u.*,
+    c.`name` as companyName,
+    i.`name` as corporationName,
+    i.id  as corporationId
+    FROM base_user  u
+    LEFT JOIN  branch_company  c ON u.company_id=c.id
+    LEFT JOIN company_info i ON c.company_id=i.id
+    <where>
+      <if test="companyId != null and companyId > 0">
+        and u.company_id = #{companyId}
+      </if>
+      <if test="corporationId != null  and corporationId > 0 ">
+        and i.id = #{corporationId}
+      </if>
+      <if test="name != null and name != '' ">
+        and ( u.name like  concat('%',#{name},'%') or  u.username like  concat('%',#{name},'%') )
+      </if>
+      <if test="dataCompanyIds != null and dataCompanyIds.size > 0">
+        and u.company_id in
+        <foreach collection="dataCompanyIds" item="id" open="(" separator="," close=")">
+          #{id}
+        </foreach>
+      </if>
+      <if test="dataCorporationIds != null and dataCorporationIds.size > 0">
+        and ( i.id  in
+        <foreach collection="dataCorporationIds" item="id" open="(" separator="," close=")">
+          #{id}
+        </foreach>
+         or ( u.corporation_id  in
+        <foreach collection="dataCorporationIds" item="id" open="(" separator="," close=")">
+          #{id}
+        </foreach>
+         and u.company_id = 0  )
+           )
+      </if>
+    </where>
+    order  by  u.id desc
+  </select>
 </mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/AdminBranchCompanyController.java

@@ -38,7 +38,7 @@ public class AdminBranchCompanyController extends BaseController<BranchCompanyBi
 
     @RequestMapping(value ="/search",method = RequestMethod.GET)
     public RestResponse<PageDataVO<CompanySearchVO>> search(@Validated CompanySearchDTO vo) {
-        setPowerData(vo,false);
+        setPowerData(vo,true);
         return RestResponse.data(baseBiz.search(vo));
     }