基础框架升级到1.1.7，集成到政务4.0体系中，增加设备显示打印类别配置模块

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificatePrintController.java

@@ -9,6 +9,7 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.service.IUser;
 import com.mortals.framework.util.DataUtil;
+import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseJsonBodyController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.YesNoEnum;
@@ -191,11 +192,13 @@ public class CertificatePrintController extends BaseJsonBodyController {
 
         int code=1;
         try {
-            List<Long> classifyIdList = deviceClassifyService.getClassifyByDevice(deviceClassifyEntity.getDeviceCode());
             CertificateClassifyQuery query = new CertificateClassifyQuery();
             query.setShowFront(YesNoEnum.YES.getValue());
-            if(CollectionUtils.isNotEmpty(classifyIdList)){
-                query.setIdList(classifyIdList);
+            if(deviceClassifyEntity!=null && StringUtils.isNotEmpty(deviceClassifyEntity.getDeviceCode())){
+                List<Long> classifyIdList = deviceClassifyService.getClassifyByDevice(deviceClassifyEntity.getDeviceCode());
+                if(CollectionUtils.isNotEmpty(classifyIdList)){
+                    query.setIdList(classifyIdList);
+                }
             }
             List<CertificateClassifyEntity> showList = certificateClassifyService.find(query);
             model.put("showList", showList);