时间标签的添加

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldEquipmentController.java

@@ -80,18 +80,18 @@ public class MouldEquipmentController {
 
     /**
      * 设备列表(仅仅只有超级管理员能够看到)
-     * 参数 token 用户唯一身份凭证 pageNum 当前页码，pageSize 每页条数 keyName 关键字查询
+     * 参数 token 用户唯一身份凭证 pageNum 当前页码，pageSize 每页条数 keyName 关键字查询,companyId 公司id（筛选）
      * @return
      */
     @ApiOperation("设备列表")
     @RequestMapping("/getEquipmentList")
     @ResponseBody
-    public HttpRespMsg getMouldEquipmentList(@RequestParam(required = false) String token, PageUtil page){
+    public HttpRespMsg getMouldEquipmentList(@RequestParam(required = false) String token, PageUtil page,Integer companyId){
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<User> qw = new QueryWrapper<>();
         qw.eq("head_imgurl",token);
         User user = userService.getOne(qw);
-        msg = mouldEquipmentService.getList(user,page);
+        msg = mouldEquipmentService.getList(user,page,companyId);
         return msg;
     }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/MouldEquipmentMapper.java

@@ -20,5 +20,5 @@ public interface MouldEquipmentMapper extends BaseMapper<MouldEquipment> {
 
     List<MouldEquipmentVO> getListByCompanyId(@Param("belongCompanyId") Integer belongCompanyId,@Param("list") List<Integer> ides);
 
-    List<MouldEquipmentVO> getList();
+    List<MouldEquipmentVO> getList(@Param("companyId")Integer companyId);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/MouldEquipmentService.java

@@ -21,7 +21,7 @@ public interface MouldEquipmentService extends IService<MouldEquipment> {
 
     HttpRespMsg isUse(MouldEquipment mouldEquipment, User user);
 
-    HttpRespMsg getList(User user,PageUtil page);
+    HttpRespMsg getList(User user,PageUtil page,Integer companyId);
 
     HttpRespMsg getListByCompanyId(MouldEquipmentVO mouldEquipmentVO);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldEquipmentServiceImpl.java

@@ -85,12 +85,12 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
     }
 
     @Override
-    public HttpRespMsg getList(User user, PageUtil page) {
+    public HttpRespMsg getList(User user, PageUtil page,Integer companyId) {
         HttpRespMsg msg = new HttpRespMsg();
         if (user != null) {
             if (Constant.SYS_PARENT_ID == user.getParentId()) {
                 PageHelper.startPage(page.getPageNum(), page.getPageSize());
-                List<MouldEquipmentVO> mouldEquipments = mouldEquipmentMapper.getList();
+                List<MouldEquipmentVO> mouldEquipments = mouldEquipmentMapper.getList(companyId);
                 PageInfo<MouldEquipmentVO> pageInfo = new PageInfo<>(mouldEquipments);
                 msg.data = pageInfo;
             } else {

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/UserServiceImpl.java

@@ -110,6 +110,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         //获取该账号的创建者
         User parentUser = userMapper.selectById(user.getParentId());
         HttpRespMsg msg = new HttpRespMsg();
+//        if(Constant.SYS_PARENT_ID == parentUser.getParentId()){
+//            //此时是创建admind,当前创建人是超级管理员
+//        }else if(){
+//
+//        }
         if (flag == 0) {
             //添加角色
             QueryWrapper<User> qw = new QueryWrapper<>();

cloud-model/src/main/resources/mapper/MouldEquipmentMapper.xml

@@ -69,5 +69,10 @@
           tb_company tbc
         on
           tbme.belong_company_id = tbc.id
+        <where>
+            <if test="companyId != null">
+                tbme.belong_company_id = #{companyId}
+            </if>
+        </where>
     </select>
 </mapper>