Просмотр исходного кода

跟进列表引入查看权限,新增是否是客户归属人判定

anderx 1 год назад
Родитель
Сommit
b78ecf4886

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

@@ -2403,7 +2403,7 @@ inner join(
 		  and a.id = #{id}
 	</select>
 	<select id="getPublicReleaseList" resultType="com.goafanti.customer.bo.PublicReleaseListBo">
-		select a.id prdId,a.uid,a.ufid,
+		select a.prid prdId,a.uid,a.ufid,
 			   date_format(b.release_start, '%Y-%m-%d ') releaseStarts,
 			   a.duration,
 			   c.name                                    aname,

+ 7 - 0
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -19,6 +19,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.*;
 import com.goafanti.customer.service.CustomerService;
+import com.goafanti.customer.service.UserArchivesService;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.BindingResult;
@@ -51,6 +52,8 @@ public class AdminCustomerApiController extends BaseApiController{
 	private Integer USER_RECEIVE_MAX = null;
 	@Resource
 	private AdminService adminService;
+	@Resource
+	private UserArchivesService userArchivesService;
 
 	@Value(value = "${aesSecretKey}")
 	private String							secretKey	= null;
@@ -1648,6 +1651,10 @@ public class AdminCustomerApiController extends BaseApiController{
 	@GetMapping("/getPublicReleaseList")
 	public Result<List<PublicReleaseListBo>> getPublicReleaseList(String id) {
 		Result res = new Result();
+		if (userArchivesService.checkPermission(id)){
+			res.error(buildError("查看超时,请要分享人重新分享。"));
+			return res;
+		}
 		res.setData(customerService.getPublicReleaseList(id));
 		return res;
 	}

+ 1 - 1
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -595,5 +595,5 @@ public interface CustomerService {
 	Object selectMyUserDetails(String id);
 	UserArchivesDetails selectUserByUid(String id);
 
-	List<PublicReleaseListBo> getPublicReleaseList(String id);
+	Object getPublicReleaseList(String id);
 }

+ 10 - 2
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -3136,8 +3136,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	}
 
     @Override
-    public List<PublicReleaseListBo> getPublicReleaseList(String id) {
-		return userMapper.getPublicReleaseList(id);
+    public Object getPublicReleaseList(String id) {
+		Map<String, Object> map=new HashMap<>();
+		User user = userMapper.selectByPrimaryKey(id);
+		if (user.getAid().equals(TokenManager.getAdminId())){
+			map.put("myUser",1);
+		}else {
+			map.put("myUser",0);
+		}
+		map.put("list",userMapper.getPublicReleaseList(id));
+		return map;
     }