|
|
@@ -6,6 +6,7 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.UUID;
|
|
|
|
|
|
+import org.aspectj.weaver.ast.And;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -75,6 +76,7 @@ if(appPages!=null)
|
|
|
|
|
|
public int deletePolicyById(Long id) {
|
|
|
if(id!=null) {
|
|
|
+ if(collectFlag)jtCollectSearchMapper.deleteByrowId(String.valueOf(id));
|
|
|
policyPublishMapper.deleteByPolicyId(id);
|
|
|
return policyMapper.deleteByPrimaryKey(id);
|
|
|
}
|
|
|
@@ -154,15 +156,12 @@ public Pagination<PolicyResult>searchPolicy(String title,Integer auditStatus,Str
|
|
|
public Pagination<AppDiscoveryBo> appListPolicy(Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
Pagination<AppDiscoveryBo>p=(Pagination<AppDiscoveryBo>) findPage("findPolicyAppList","findPolicyAppCount",params, pageNo, pageSize);
|
|
|
- List<AppDiscoveryBo> l=(List<AppDiscoveryBo>) p.getList();
|
|
|
- for (AppDiscoveryBo a : l) {
|
|
|
- a.setContent(a.getContent().replaceAll("<p>", "").replaceAll("</p>", ""));
|
|
|
- }
|
|
|
return p;
|
|
|
}
|
|
|
|
|
|
public PolicyResult policyDetail(String id) {
|
|
|
- return policyMapper.selectPolicyDetail(id);
|
|
|
+ PolicyResult policyResult =policyMapper.selectPolicyDetail(id);
|
|
|
+ return policyResult;
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|